Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 71761) +++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 71762) @@ -220,6 +220,4 @@ * Internal Functions * *********************************************************************************************************************************/ -static int sb16CreateDrvStream(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg, PSB16DRIVER pDrv); -static void sb16DestroyDrvStream(PSB16STATE pThis, PSB16DRIVER pDrv); static int sb16OpenOut(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg); static void sb16CloseOut(PSB16STATE pThis); @@ -230,217 +228,4 @@ - -/** - * Attach command, internal version. - * - * This is called to let the device attach to a driver for a specified LUN - * during runtime. This is not called during VM construction, the device - * constructor has to attach to all the available drivers. - * - * @returns VBox status code. - * @param pThis SB16 state. - * @param uLUN The logical unit which is being detached. - * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. - * @param ppDrv Attached driver instance on success. Optional. - */ -static int sb16AttachInternal(PSB16STATE pThis, unsigned uLUN, uint32_t fFlags, PSB16DRIVER *ppDrv) -{ - RT_NOREF(fFlags); - - /* - * Attach driver. - */ - char *pszDesc; - if (RTStrAPrintf(&pszDesc, "Audio driver port (SB16) for LUN #%u", uLUN) <= 0) - AssertLogRelFailedReturn(VERR_NO_MEMORY); - - PPDMIBASE pDrvBase; - int rc = PDMDevHlpDriverAttach(pThis->pDevInsR3, uLUN, - &pThis->IBase, &pDrvBase, pszDesc); - if (RT_SUCCESS(rc)) - { - PSB16DRIVER pDrv = (PSB16DRIVER)RTMemAllocZ(sizeof(SB16DRIVER)); - if (pDrv) - { - pDrv->pDrvBase = pDrvBase; - pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pDrvBase, PDMIAUDIOCONNECTOR); - AssertMsg(pDrv->pConnector != NULL, ("Configuration error: LUN #%u has no host audio interface, rc=%Rrc\n", uLUN, rc)); - pDrv->pSB16State = pThis; - pDrv->uLUN = uLUN; - - /* - * For now we always set the driver at LUN 0 as our primary - * host backend. This might change in the future. - */ - if (pDrv->uLUN == 0) - pDrv->fFlags |= PDMAUDIODRVFLAGS_PRIMARY; - - LogFunc(("LUN#%RU8: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->fFlags)); - - /* Attach to driver list if not attached yet. */ - if (!pDrv->fAttached) - { - RTListAppend(&pThis->lstDrv, &pDrv->Node); - pDrv->fAttached = true; - } - - if (ppDrv) - *ppDrv = pDrv; - } - else - rc = VERR_NO_MEMORY; - } - else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) - LogFunc(("No attached driver for LUN #%u\n", uLUN)); - - if (RT_FAILURE(rc)) - { - /* Only free this string on failure; - * must remain valid for the live of the driver instance. */ - RTStrFree(pszDesc); - } - - LogFunc(("iLUN=%u, fFlags=0x%x, rc=%Rrc\n", uLUN, fFlags, rc)); - return rc; -} - -/** - * Detach command, internal version. - * - * This is called to let the device detach from a driver for a specified LUN - * during runtime. - * - * @returns VBox status code. - * @param pThis SB16 state. - * @param pDrv Driver to detach device from. - * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. - */ -static int sb16DetachInternal(PSB16STATE pThis, PSB16DRIVER pDrv, uint32_t fFlags) -{ - RT_NOREF(fFlags); - - sb16DestroyDrvStream(pThis, pDrv); - - RTListNodeRemove(&pDrv->Node); - - LogFunc(("uLUN=%u, fFlags=0x%x\n", pDrv->uLUN, fFlags)); - return VINF_SUCCESS; -} - -/** - * @interface_method_impl{PDMDEVREG,pfnAttach} - */ -static DECLCALLBACK(int) sb16Attach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags) -{ - PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE); - - LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags)); - - PSB16DRIVER pDrv; - int rc2 = sb16AttachInternal(pThis, uLUN, fFlags, &pDrv); - if (RT_SUCCESS(rc2)) - rc2 = sb16CreateDrvStream(pThis, &pThis->Out.Cfg, pDrv); - - return VINF_SUCCESS; -} - -/** - * @interface_method_impl{PDMDEVREG,pfnDetach} - */ -static DECLCALLBACK(void) sb16Detach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags) -{ - PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE); - - LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags)); - - PSB16DRIVER pDrv, pDrvNext; - RTListForEachSafe(&pThis->lstDrv, pDrv, pDrvNext, SB16DRIVER, Node) - { - if (pDrv->uLUN == uLUN) - { - int rc2 = sb16DetachInternal(pThis, pDrv, fFlags); - if (RT_SUCCESS(rc2)) - { - RTMemFree(pDrv); - pDrv = NULL; - } - - break; - } - } -} - -/** - * Re-attaches (replaces) a driver with a new driver. - * - * @returns VBox status code. - * @param pThis Device instance. - * @param pDrv Driver instance used for attaching to. - * If NULL is specified, a new driver will be created and appended - * to the driver list. - * @param uLUN The logical unit which is being re-detached. - * @param pszDriver New driver name to attach. - */ -static int sb16Reattach(PSB16STATE pThis, PSB16DRIVER pDrv, uint8_t uLUN, const char *pszDriver) -{ - AssertPtrReturn(pThis, VERR_INVALID_POINTER); - AssertPtrReturn(pszDriver, VERR_INVALID_POINTER); - - int rc; - - if (pDrv) - { - rc = sb16DetachInternal(pThis, pDrv, 0 /* fFlags */); - if (RT_SUCCESS(rc)) - rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); - - if (RT_FAILURE(rc)) - return rc; - - pDrv = NULL; - } - - PVM pVM = PDMDevHlpGetVM(pThis->pDevInsR3); - PCFGMNODE pRoot = CFGMR3GetRoot(pVM); - PCFGMNODE pDev0 = CFGMR3GetChild(pRoot, "Devices/sb16/0/"); - - /* Remove LUN branch. */ - CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN)); - - if (pDrv) - { - /* Re-use the driver instance so detach it before. */ - rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); - if (RT_FAILURE(rc)) - return rc; - } - -#define RC_CHECK() if (RT_FAILURE(rc)) { AssertReleaseRC(rc); break; } - - do - { - PCFGMNODE pLunL0; - rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", uLUN); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config/", NULL); RC_CHECK(); - - PCFGMNODE pLunL1, pLunL2; - rc = CFGMR3InsertNode (pLunL0, "AttachedDriver/", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertNode (pLunL1, "Config/", &pLunL2); RC_CHECK(); - rc = CFGMR3InsertString(pLunL1, "Driver", pszDriver); RC_CHECK(); - - rc = CFGMR3InsertString(pLunL2, "AudioDriver", pszDriver); RC_CHECK(); - - } while (0); - - if (RT_SUCCESS(rc)) - rc = sb16AttachInternal(pThis, uLUN, 0 /* fFlags */, NULL /* ppDrv */); - - LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, uLUN, pszDriver, rc)); - -#undef RC_CHECK - - return rc; -} static int magic_of_irq(int irq) @@ -2416,4 +2201,231 @@ } + +/** + * @interface_method_impl{PDMIBASE,pfnQueryInterface} + */ +static DECLCALLBACK(void *) sb16QueryInterface(struct PDMIBASE *pInterface, const char *pszIID) +{ + PSB16STATE pThis = RT_FROM_MEMBER(pInterface, SB16STATE, IBase); + Assert(&pThis->IBase == pInterface); + + PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase); + return NULL; +} + + +/** + * Attach command, internal version. + * + * This is called to let the device attach to a driver for a specified LUN + * during runtime. This is not called during VM construction, the device + * constructor has to attach to all the available drivers. + * + * @returns VBox status code. + * @param pThis SB16 state. + * @param uLUN The logical unit which is being detached. + * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. + * @param ppDrv Attached driver instance on success. Optional. + */ +static int sb16AttachInternal(PSB16STATE pThis, unsigned uLUN, uint32_t fFlags, PSB16DRIVER *ppDrv) +{ + RT_NOREF(fFlags); + + /* + * Attach driver. + */ + char *pszDesc; + if (RTStrAPrintf(&pszDesc, "Audio driver port (SB16) for LUN #%u", uLUN) <= 0) + AssertLogRelFailedReturn(VERR_NO_MEMORY); + + PPDMIBASE pDrvBase; + int rc = PDMDevHlpDriverAttach(pThis->pDevInsR3, uLUN, + &pThis->IBase, &pDrvBase, pszDesc); + if (RT_SUCCESS(rc)) + { + PSB16DRIVER pDrv = (PSB16DRIVER)RTMemAllocZ(sizeof(SB16DRIVER)); + if (pDrv) + { + pDrv->pDrvBase = pDrvBase; + pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pDrvBase, PDMIAUDIOCONNECTOR); + AssertMsg(pDrv->pConnector != NULL, ("Configuration error: LUN #%u has no host audio interface, rc=%Rrc\n", uLUN, rc)); + pDrv->pSB16State = pThis; + pDrv->uLUN = uLUN; + + /* + * For now we always set the driver at LUN 0 as our primary + * host backend. This might change in the future. + */ + if (pDrv->uLUN == 0) + pDrv->fFlags |= PDMAUDIODRVFLAGS_PRIMARY; + + LogFunc(("LUN#%RU8: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->fFlags)); + + /* Attach to driver list if not attached yet. */ + if (!pDrv->fAttached) + { + RTListAppend(&pThis->lstDrv, &pDrv->Node); + pDrv->fAttached = true; + } + + if (ppDrv) + *ppDrv = pDrv; + } + else + rc = VERR_NO_MEMORY; + } + else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) + LogFunc(("No attached driver for LUN #%u\n", uLUN)); + + if (RT_FAILURE(rc)) + { + /* Only free this string on failure; + * must remain valid for the live of the driver instance. */ + RTStrFree(pszDesc); + } + + LogFunc(("iLUN=%u, fFlags=0x%x, rc=%Rrc\n", uLUN, fFlags, rc)); + return rc; +} + +/** + * Detach command, internal version. + * + * This is called to let the device detach from a driver for a specified LUN + * during runtime. + * + * @returns VBox status code. + * @param pThis SB16 state. + * @param pDrv Driver to detach device from. + * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. + */ +static int sb16DetachInternal(PSB16STATE pThis, PSB16DRIVER pDrv, uint32_t fFlags) +{ + RT_NOREF(fFlags); + + sb16DestroyDrvStream(pThis, pDrv); + + RTListNodeRemove(&pDrv->Node); + + LogFunc(("uLUN=%u, fFlags=0x%x\n", pDrv->uLUN, fFlags)); + return VINF_SUCCESS; +} + +/** + * @interface_method_impl{PDMDEVREG,pfnAttach} + */ +static DECLCALLBACK(int) sb16Attach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags) +{ + PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE); + + LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags)); + + PSB16DRIVER pDrv; + int rc2 = sb16AttachInternal(pThis, uLUN, fFlags, &pDrv); + if (RT_SUCCESS(rc2)) + rc2 = sb16CreateDrvStream(pThis, &pThis->Out.Cfg, pDrv); + + return VINF_SUCCESS; +} + +/** + * @interface_method_impl{PDMDEVREG,pfnDetach} + */ +static DECLCALLBACK(void) sb16Detach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags) +{ + PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE); + + LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags)); + + PSB16DRIVER pDrv, pDrvNext; + RTListForEachSafe(&pThis->lstDrv, pDrv, pDrvNext, SB16DRIVER, Node) + { + if (pDrv->uLUN == uLUN) + { + int rc2 = sb16DetachInternal(pThis, pDrv, fFlags); + if (RT_SUCCESS(rc2)) + { + RTMemFree(pDrv); + pDrv = NULL; + } + + break; + } + } +} + +/** + * Re-attaches (replaces) a driver with a new driver. + * + * @returns VBox status code. + * @param pThis Device instance. + * @param pDrv Driver instance used for attaching to. + * If NULL is specified, a new driver will be created and appended + * to the driver list. + * @param uLUN The logical unit which is being re-detached. + * @param pszDriver New driver name to attach. + */ +static int sb16Reattach(PSB16STATE pThis, PSB16DRIVER pDrv, uint8_t uLUN, const char *pszDriver) +{ + AssertPtrReturn(pThis, VERR_INVALID_POINTER); + AssertPtrReturn(pszDriver, VERR_INVALID_POINTER); + + int rc; + + if (pDrv) + { + rc = sb16DetachInternal(pThis, pDrv, 0 /* fFlags */); + if (RT_SUCCESS(rc)) + rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); + + if (RT_FAILURE(rc)) + return rc; + + pDrv = NULL; + } + + PVM pVM = PDMDevHlpGetVM(pThis->pDevInsR3); + PCFGMNODE pRoot = CFGMR3GetRoot(pVM); + PCFGMNODE pDev0 = CFGMR3GetChild(pRoot, "Devices/sb16/0/"); + + /* Remove LUN branch. */ + CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN)); + + if (pDrv) + { + /* Re-use the driver instance so detach it before. */ + rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); + if (RT_FAILURE(rc)) + return rc; + } + +#define RC_CHECK() if (RT_FAILURE(rc)) { AssertReleaseRC(rc); break; } + + do + { + PCFGMNODE pLunL0; + rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", uLUN); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config/", NULL); RC_CHECK(); + + PCFGMNODE pLunL1, pLunL2; + rc = CFGMR3InsertNode (pLunL0, "AttachedDriver/", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertNode (pLunL1, "Config/", &pLunL2); RC_CHECK(); + rc = CFGMR3InsertString(pLunL1, "Driver", pszDriver); RC_CHECK(); + + rc = CFGMR3InsertString(pLunL2, "AudioDriver", pszDriver); RC_CHECK(); + + } while (0); + + if (RT_SUCCESS(rc)) + rc = sb16AttachInternal(pThis, uLUN, 0 /* fFlags */, NULL /* ppDrv */); + + LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, uLUN, pszDriver, rc)); + +#undef RC_CHECK + + return rc; +} + /** * @interface_method_impl{PDMDEVREG,pfnReset} @@ -2447,16 +2459,4 @@ sb16Control(pThis, 0); sb16ResetLegacy(pThis); -} - -/** - * @interface_method_impl{PDMIBASE,pfnQueryInterface} - */ -static DECLCALLBACK(void *) sb16QueryInterface(struct PDMIBASE *pInterface, const char *pszIID) -{ - PSB16STATE pThis = RT_FROM_MEMBER(pInterface, SB16STATE, IBase); - Assert(&pThis->IBase == pInterface); - - PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase); - return NULL; } @@ -2782,2 +2782,3 @@ PDM_DEVREG_VERSION }; +