Changeset 82346 in vbox
- Timestamp:
- Dec 3, 2019 2:50:58 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
r82345 r82346 274 274 { 275 275 /** Location of data buffer (bits 31:1). */ 276 uint32_t addr;276 uint32_t addr; 277 277 /** Flags (bits 31 + 30) and length (bits 15:0) of data buffer (in audio samples). */ 278 uint32_t ctl_len;278 uint32_t ctl_len; 279 279 } AC97BDLE; 280 280 AssertCompileSize(AC97BDLE, 8); … … 287 287 typedef struct AC97BMREGS 288 288 { 289 uint32_t bdbar;/**< rw 0, Buffer Descriptor List: BAR (Base Address Register). */290 uint8_t civ;/**< ro 0, Current index value. */291 uint8_t lvi;/**< rw 0, Last valid index. */292 uint16_t sr;/**< rw 1, Status register. */293 uint16_t picb;/**< ro 0, Position in current buffer (in samples). */294 uint8_t piv;/**< ro 0, Prefetched index value. */295 uint8_t cr;/**< rw 0, Control register. */296 int32_t bd_valid;/**< Whether current BDLE is initialized or not. */297 AC97BDLE bd;/**< Current Buffer Descriptor List Entry (BDLE). */289 uint32_t bdbar; /**< rw 0, Buffer Descriptor List: BAR (Base Address Register). */ 290 uint8_t civ; /**< ro 0, Current index value. */ 291 uint8_t lvi; /**< rw 0, Last valid index. */ 292 uint16_t sr; /**< rw 1, Status register. */ 293 uint16_t picb; /**< ro 0, Position in current buffer (in samples). */ 294 uint8_t piv; /**< ro 0, Prefetched index value. */ 295 uint8_t cr; /**< rw 0, Control register. */ 296 int32_t bd_valid; /**< Whether current BDLE is initialized or not. */ 297 AC97BDLE bd; /**< Current Buffer Descriptor List Entry (BDLE). */ 298 298 } AC97BMREGS; 299 299 AssertCompileSizeAlignment(AC97BMREGS, 8); … … 374 374 { 375 375 /** Whether debugging is enabled or not. */ 376 bool fEnabled;377 uint8_t Padding[7];376 bool fEnabled; 377 uint8_t Padding[7]; 378 378 /** File for dumping stream reads / writes. 379 379 * For input streams, this dumps data being written to the device FIFO, 380 380 * whereas for output streams this dumps data being read from the device FIFO. */ 381 R3PTRTYPE(PPDMAUDIOFILE) pFileStream;381 R3PTRTYPE(PPDMAUDIOFILE) pFileStream; 382 382 /** File for dumping DMA reads / writes. 383 383 * For input streams, this dumps data being written to the device DMA, 384 384 * whereas for output streams this dumps data being read from the device DMA. */ 385 R3PTRTYPE(PPDMAUDIOFILE) pFileDMA;385 R3PTRTYPE(PPDMAUDIOFILE) pFileDMA; 386 386 } AC97STREAMDEBUGRT; 387 387 … … 401 401 { 402 402 /** Stream number (SDn). */ 403 uint8_t u8SD;404 uint8_t abPadding0[7];403 uint8_t u8SD; 404 uint8_t abPadding0[7]; 405 405 /** Bus master registers of this stream. */ 406 AC97BMREGS Regs;406 AC97BMREGS Regs; 407 407 /** Internal state of this stream. */ 408 AC97STREAMSTATE State;408 AC97STREAMSTATE State; 409 409 /** Pointer to parent (AC'97 state). */ 410 R3PTRTYPE(PAC97STATE) pAC97State;410 R3PTRTYPE(PAC97STATE) pAC97State; 411 411 #if HC_ARCH_BITS == 32 412 uint32_t Padding1;412 uint32_t Padding1; 413 413 #endif 414 414 /** The timer for pumping data thru the attached LUN drivers. */ … … 428 428 typedef struct AC97STREAMTHREADCTX 429 429 { 430 PAC97STATE pThis;431 PAC97STREAM pStream;430 PAC97STATE pThis; 431 PAC97STREAM pStream; 432 432 } AC97STREAMTHREADCTX; 433 433 /** Pointer to the context for an async I/O thread. */ … … 444 444 { 445 445 /** Associated mixer stream handle. */ 446 R3PTRTYPE(PAUDMIXSTREAM) 446 R3PTRTYPE(PAUDMIXSTREAM) pMixStrm; 447 447 } AC97DRIVERSTREAM; 448 448 /** Pointer to a driver stream. */ … … 455 455 { 456 456 /** Node for storing this driver in our device driver list of AC97STATE. */ 457 RTLISTNODER3 457 RTLISTNODER3 Node; 458 458 /** Pointer to AC97 controller (state). */ 459 R3PTRTYPE(PAC97STATE) 459 R3PTRTYPE(PAC97STATE) pAC97State; 460 460 /** Driver flags. */ 461 PDMAUDIODRVFLAGS 461 PDMAUDIODRVFLAGS fFlags; 462 462 /** LUN # to which this driver has been assigned. */ 463 uint8_t 463 uint8_t uLUN; 464 464 /** Whether this driver is in an attached state or not. */ 465 bool 466 uint8_t 465 bool fAttached; 466 uint8_t abPadding[2]; 467 467 /** Pointer to the description string passed to PDMDevHlpDriverAttach(). */ 468 R3PTRTYPE(char *) 468 R3PTRTYPE(char *) pszDesc; 469 469 /** Pointer to attached driver base interface. */ 470 R3PTRTYPE(PPDMIBASE) 470 R3PTRTYPE(PPDMIBASE) pDrvBase; 471 471 /** Audio connector interface to the underlying host backend. */ 472 R3PTRTYPE(PPDMIAUDIOCONNECTOR) 472 R3PTRTYPE(PPDMIAUDIOCONNECTOR) pConnector; 473 473 /** Driver stream for line input. */ 474 AC97DRIVERSTREAM 474 AC97DRIVERSTREAM LineIn; 475 475 /** Driver stream for mic input. */ 476 AC97DRIVERSTREAM 476 AC97DRIVERSTREAM MicIn; 477 477 /** Driver stream for output. */ 478 AC97DRIVERSTREAM 478 AC97DRIVERSTREAM Out; 479 479 } AC97DRIVER; 480 480 /** Pointer to a host backend driver (LUN). */ … … 487 487 { 488 488 /** Whether debugging is enabled or not. */ 489 bool 489 bool fEnabled; 490 490 /** Path where to dump the debug output to. 491 491 * Defaults to VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH. */ 492 char 492 char szOutPath[RTPATH_MAX]; 493 493 } AC97STATEDEBUG; 494 494
Note:
See TracChangeset
for help on using the changeset viewer.