- Timestamp:
- Jun 9, 2015 10:52:56 PM (9 years ago)
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
r56161 r56316 1156 1156 PDRVHOSTPULSEAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPULSEAUDIO); 1157 1157 LogRel(("Audio: Initializing PulseAudio driver\n")); 1158 1158 1159 1159 CFGMR3QueryStringAlloc(pCfg, "StreamName", &pThis->pszStreamName); 1160 1160 -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
r56292 r56316 3572 3572 { 3573 3573 rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (VMSVGA_FIFO_SIZE - 1), 3574 pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, 3574 pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, 3575 3575 "VMSVGA FIFO"); 3576 3576 AssertRC(rc); -
trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
r56097 r56316 110 110 RT_ZERO(pVBVAData->guest.pVBVA->hostFlags); 111 111 } 112 112 113 113 RTMemFree(pVBVAData->partialRecord.pu8); 114 114 -
trunk/src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c
r54571 r56316 80 80 /* Skipped if DRM_VMW_PARAM_MAX_MOB_MEMORY is read. */ 81 81 struct SVGA3dCapsRecordHeader header; 82 uint32_t data[1]; 82 uint32_t data[1]; 83 83 }; 84 84 … … 341 341 } 342 342 else 343 printf("%32s: failed: rc=%d errno=%d (%s)\n", pszParam, rc, errno, strerror(errno)); 343 printf("%32s: failed: rc=%d errno=%d (%s)\n", pszParam, rc, errno, strerror(errno)); 344 344 return rc; 345 345 } … … 596 596 if (argc == 2) 597 597 pszDev = argv[1]; 598 598 599 599 int fd = open(pszDev, O_RDWR); 600 600 if (fd != -1) … … 607 607 */ 608 608 rcExit = Dump3DParameters(fd, rcExit); 609 609 610 610 /* 611 611 * 3D capabilities. … … 625 625 rcExit = 1; 626 626 } 627 627 628 628 return rcExit; 629 629 } -
trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp
r56292 r56316 1260 1260 * Look up specified address in the network's blacklist. 1261 1261 * 1262 * @param pNetwork The network. 1262 * @param pNetwork The network. 1263 1263 * @param enmType The address type. 1264 1264 * @param pAddr The address. … … 1289 1289 * Deletes specified address from network's blacklist. 1290 1290 * 1291 * @param pNetwork The network. 1291 * @param pNetwork The network. 1292 1292 * @param enmType The address type. 1293 1293 * @param pAddr The address. … … 1322 1322 * Adds specified address from network's blacklist. 1323 1323 * 1324 * @param pNetwork The network. 1324 * @param pNetwork The network. 1325 1325 * @param enmType The address type. 1326 1326 * @param pAddr The address. … … 1348 1348 { 1349 1349 /* shift */ 1350 memmove(pCache->pbEntries, pCache->pbEntries + pCache->cbEntry, 1350 memmove(pCache->pbEntries, pCache->pbEntries + pCache->cbEntry, 1351 1351 pCache->cbEntry * (pCache->cEntries - 1)); 1352 1352 --pCache->cEntries; … … 1405 1405 __FUNCTION__, &pAddr->IPv6)); 1406 1406 break; 1407 default: 1407 default: 1408 1408 Log(("%s: spoofing attempt for %.*Rhxs (type %d)\n", 1409 1409 __FUNCTION__, cbAddr, pAddr, enmAddrType)); -
trunk/src/VBox/Devices/PC/BIOS/floppy.c
r56292 r56316 1116 1116 1117 1117 // Format type (AL) 1118 // 00 - NOT USED 1119 // 01 - DISKETTE 360K IN 360K DRIVE 1118 // 00 - NOT USED 1119 // 01 - DISKETTE 360K IN 360K DRIVE 1120 1120 // 02 - DISKETTE 360K IN 1.2M DRIVE 1121 1121 // 03 - DISKETTE 1.2M IN 1.2M DRIVE … … 1131 1131 return; 1132 1132 } 1133 1133 1134 1134 // see if drive exists 1135 1135 if (floppy_drive_exists(drive) == 0) { … … 1216 1216 SET_AH(0x0C); // drive/media type unknown 1217 1217 set_diskette_ret_status(0x0C); 1218 SET_CF(); 1218 SET_CF(); 1219 1219 return; 1220 1220 } … … 1227 1227 else 1228 1228 drive_type &= 0x0f; 1229 1229 1230 1230 // Get current drive state. Set 'base_address' to media status offset address 1231 1231 base_address = (drive) ? 0x0091 : 0x0090; … … 1242 1242 break; 1243 1243 case 2: // 1.2MB, 5.25" 1244 if (track == 39 && num_sectors == 9) { // 360K disk in 1.2M drive 1244 if (track == 39 && num_sectors == 9) { // 360K disk in 1.2M drive 1245 1245 media_state |= 0x70; // 0111 0000 (media type established, double stepping, 300 kbps) 1246 1246 } else if (track == 79 && num_sectors == 15) { // 1.2M disk in 1.2M drive … … 1252 1252 media_state |= 0x90; // 1001 0000 (media type established, 250 kbps) 1253 1253 1254 1254 break; 1255 1255 case 4: // 1.44MB, 3.5" 1256 1256 if (track == 79) { … … 1260 1260 media_state |= 0x10; // 0001 0000 (media type established, 500 kbps) 1261 1261 } 1262 } 1262 } 1263 1263 break; 1264 1264 case 5: // 2.88MB, 3.5" … … 1283 1283 SET_AH(0x0C); 1284 1284 set_diskette_ret_status(0x0C); 1285 SET_CF(); 1285 SET_CF(); 1286 1286 return; 1287 1287 } … … 1290 1290 write_byte(0x0040, base_address, media_state); 1291 1291 1292 // set es & di to point to 11 byte diskette param table in ROM 1292 // set es & di to point to 11 byte diskette param table in ROM 1293 1293 ES = 0xF000; // @todo: any way to make this relocatable? 1294 1294 DI = get_floppy_dpt(drive_type);
Note:
See TracChangeset
for help on using the changeset viewer.