diff --git a/VersionNum b/VersionNum index 611838571e783bfa7adee43ad854a7b7981d2d3d..b466cbd838a0cc5e8a18aefe4781dd03e4febd0e 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,23 @@ -/* (0.92) +/* (0.93) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 0.92 +#define Module_MajorVersion_CMHG 0.93 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 15 Dec 2013 +#define Module_Date_CMHG 17 Dec 2013 -#define Module_MajorVersion "0.92" -#define Module_Version 92 +#define Module_MajorVersion "0.93" +#define Module_Version 93 #define Module_MinorVersion "" -#define Module_Date "15 Dec 2013" +#define Module_Date "17 Dec 2013" -#define Module_ApplicationDate "15-Dec-13" +#define Module_ApplicationDate "17-Dec-13" #define Module_ComponentName "OMAP3" #define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP3" -#define Module_FullVersion "0.92" -#define Module_HelpVersion "0.92 (15 Dec 2013)" -#define Module_LibraryVersionInfo "0:92" +#define Module_FullVersion "0.93" +#define Module_HelpVersion "0.93 (17 Dec 2013)" +#define Module_LibraryVersionInfo "0:93" diff --git a/hdr/Audio b/hdr/Audio index 41273cc8085a429d22263a7cc9219797d876fdd2..13bec9e1bd0b46aa6386816c6c9c9f192295693e 100644 --- a/hdr/Audio +++ b/hdr/Audio @@ -171,7 +171,7 @@ ST_McBSP3_IRQ * 5 ; Audio device ^ 0, a1 ; Public bits -AudioDevice # HALDevice_Audio_Size_1 +AudioDevice # HALDevice_Audio_Size_2 ; Private bits AudioRegs # 4 ; L4_McBSP*_Log AudioWorkspace # 4 ; HAL workspace pointer diff --git a/s/Audio b/s/Audio index 965e869422f5bc5910509ab5d560c476250d6c6f..b451b8e664724998a91114e35a0584cc0f9d124d 100644 --- a/s/Audio +++ b/s/Audio @@ -472,6 +472,8 @@ AudioTemplate DCD ratetab ; Sample rate table DCD AudioSetRate ; SetRate function ASSERT (.-AudioTemplate) = HALDevice_Audio_Size_1 + % 16 ; Padding to keep things the same size as the Pandora device struct + ASSERT (.-AudioTemplate) = HALDevice_Audio_Size_2 DCD 0 ; Filled in during init DCD 0 ; Filled in during init DCD 0 diff --git a/s/PAudio b/s/PAudio index 25dffb277cda532b41fcd4535984135af5c35cca..71e9105652713a9c88685fe050d110448769329b 100644 --- a/s/PAudio +++ b/s/PAudio @@ -295,7 +295,7 @@ AudioTemplate DCW HALDeviceType_Audio + HALDeviceAudio_AudC DCW HALDeviceID_AudC_Pandora DCD HALDeviceBus_Ser + HALDeviceSerBus_IIC - DCD 1:SHL:16 ; API version + DCD 2:SHL:16 ; API version DCD AudioDesc DCD 0 ; Address - N/A % 12 ; Reserved @@ -326,6 +326,11 @@ AudioTemplate DCD ratetab ; Sample rate table DCD AudioSetRate ; SetRate function ASSERT (.-AudioTemplate) = HALDevice_Audio_Size_1 + DCD 0 ; AudioCustomDMAEnable + DCD HALDevice_AudioFlag_StereoReverse + DCD 0 ; AudioMinBuffSize + DCD 0 ; AudioBuffAlign + ASSERT (.-AudioTemplate) = HALDevice_Audio_Size_2 DCD 0 ; Filled in during init DCD 0 ; Filled in during init DCD 0