diff options
author | Jebaraj Selvapeter P | 2014-04-14 07:51:45 -0500 |
---|---|---|
committer | Jebaraj Selvapeter P | 2014-04-14 07:51:45 -0500 |
commit | 69df517dc4a66599edb8c4526c1f75b501346590 (patch) | |
tree | ae1f44213f21fa605231b0b08416fbc3defe8a87 | |
parent | c8695cfc032f9b81370c5539a7dc29317fe867b7 (diff) | |
download | paf-69df517dc4a66599edb8c4526c1f75b501346590.tar.gz paf-69df517dc4a66599edb8c4526c1f75b501346590.tar.xz paf-69df517dc4a66599edb8c4526c1f75b501346590.zip |
Source Program subtype added
DEL3 ASP updated to support 32 channels
-rw-r--r-- | pa/asp/del3/delerr.h | 6 | ||||
-rw-r--r-- | pa/asp/del3/idel.c | 2 | ||||
-rw-r--r-- | pa/asp/del3/idel_pcmnhc.c | 2 | ||||
-rw-r--r-- | pa/f/alpha/pafdec_a.h | 10 | ||||
-rw-r--r-- | pa/f/include/pafdec.h | 15 |
5 files changed, 29 insertions, 6 deletions
diff --git a/pa/asp/del3/delerr.h b/pa/asp/del3/delerr.h index d6db3f1..73a5e45 100644 --- a/pa/asp/del3/delerr.h +++ b/pa/asp/del3/delerr.h | |||
@@ -45,9 +45,9 @@ | |||
45 | 45 | ||
46 | #include <acpbeta.h> | 46 | #include <acpbeta.h> |
47 | 47 | ||
48 | #if ! (PAF_MAXNUMCHAN <= 16) | 48 | #if ! (PAF_MAXNUMCHAN <= 32) |
49 | #error error numbers designed for PAF_MAXNUMCHAN <= 16 | 49 | #error error numbers designed for PAF_MAXNUMCHAN <= 32 |
50 | #endif /* ! (PAF_MAXNUMCHAN <= 16) */ | 50 | #endif /* ! (PAF_MAXNUMCHAN <= 32) */ |
51 | 51 | ||
52 | #define DELERR_UNSPECIFIED ((STD_BETA_DEL<<8)+0x00) | 52 | #define DELERR_UNSPECIFIED ((STD_BETA_DEL<<8)+0x00) |
53 | 53 | ||
diff --git a/pa/asp/del3/idel.c b/pa/asp/del3/idel.c index 0b532c1..392cb04 100644 --- a/pa/asp/del3/idel.c +++ b/pa/asp/del3/idel.c | |||
@@ -52,7 +52,7 @@ const IDEL_Status IDEL_PARAMS_STATUS_BASIC = { | |||
52 | 1, /* mode */ | 52 | 1, /* mode */ |
53 | 1, /* unit */ | 53 | 1, /* unit */ |
54 | PAF_MAXNUMCHAN, 5, /* numc, nums */ | 54 | PAF_MAXNUMCHAN, 5, /* numc, nums */ |
55 | 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, /* delay */ | 55 | 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* delay */ |
56 | 0, /* masterDelay */ | 56 | 0, /* masterDelay */ |
57 | }; | 57 | }; |
58 | 58 | ||
diff --git a/pa/asp/del3/idel_pcmnhc.c b/pa/asp/del3/idel_pcmnhc.c index 962fddc..9a1753c 100644 --- a/pa/asp/del3/idel_pcmnhc.c +++ b/pa/asp/del3/idel_pcmnhc.c | |||
@@ -51,7 +51,7 @@ const IDEL_Status IDEL_PARAMS_STATUS_PCMNHC = { | |||
51 | 1, /* mode */ | 51 | 1, /* mode */ |
52 | 1, /* unit */ | 52 | 1, /* unit */ |
53 | PAF_MAXNUMCHAN, 2, /* numc, nums */ | 53 | PAF_MAXNUMCHAN, 2, /* numc, nums */ |
54 | DELAY_INMS, DELAY_INMS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* delay */ | 54 | DELAY_INMS, DELAY_INMS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* delay */ |
55 | 0, /* masterDelay */ | 55 | 0, /* masterDelay */ |
56 | }; | 56 | }; |
57 | 57 | ||
diff --git a/pa/f/alpha/pafdec_a.h b/pa/f/alpha/pafdec_a.h index dc3092f..79b348a 100644 --- a/pa/f/alpha/pafdec_a.h +++ b/pa/f/alpha/pafdec_a.h | |||
@@ -52,6 +52,7 @@ | |||
52 | #define readDECSampleRate 0xc200+STD_BETA_DECODE,0x0800 | 52 | #define readDECSampleRate 0xc200+STD_BETA_DECODE,0x0800 |
53 | #define readDECSourceSelect 0xc200+STD_BETA_DECODE,0x0900 | 53 | #define readDECSourceSelect 0xc200+STD_BETA_DECODE,0x0900 |
54 | #define readDECSourceProgram 0xc200+STD_BETA_DECODE,0x0a00 | 54 | #define readDECSourceProgram 0xc200+STD_BETA_DECODE,0x0a00 |
55 | #define readDECSourceProgramSubType 0xc200+STD_BETA_DECODE,0x3700 | ||
55 | #define readDECSourceDecode 0xc200+STD_BETA_DECODE,0x0b00 | 56 | #define readDECSourceDecode 0xc200+STD_BETA_DECODE,0x0b00 |
56 | #define readDECSourceDual 0xc200+STD_BETA_DECODE,0x0c00 | 57 | #define readDECSourceDual 0xc200+STD_BETA_DECODE,0x0c00 |
57 | #define readDECSourceKaraoke 0xc200+STD_BETA_DECODE,0x0d00 | 58 | #define readDECSourceKaraoke 0xc200+STD_BETA_DECODE,0x0d00 |
@@ -1950,6 +1951,15 @@ | |||
1950 | #define wroteDECSourceProgramDXP 0xca00+STD_BETA_DECODE,0x0a1a | 1951 | #define wroteDECSourceProgramDXP 0xca00+STD_BETA_DECODE,0x0a1a |
1951 | #define wroteDECSourceProgramWMA 0xca00+STD_BETA_DECODE,0x0a1b | 1952 | #define wroteDECSourceProgramWMA 0xca00+STD_BETA_DECODE,0x0a1b |
1952 | 1953 | ||
1954 | #define wroteDECSourceProgramSubTypeUnknown 0xca00+STD_BETA_DECODE,0x3700 | ||
1955 | #define wroteDECSourceProgramSubTypeNone 0xca00+STD_BETA_DECODE,0x3701 | ||
1956 | #define wroteDECSourceProgramSubTypeMatPCMObj 0xca00+STD_BETA_DECODE,0x3702 | ||
1957 | #define wroteDECSourceProgramSubTypeMatPCMCnl 0xca00+STD_BETA_DECODE,0x3703 | ||
1958 | #define wroteDECSourceProgramSubTypeMatTHDObj 0xca00+STD_BETA_DECODE,0x3704 | ||
1959 | #define wroteDECSourceProgramSubTypeMatTHDCnl 0xca00+STD_BETA_DECODE,0x3705 | ||
1960 | #define wroteDECSourceProgramSubTypeDDPObj 0xca00+STD_BETA_DECODE,0x3706 | ||
1961 | #define wroteDECSourceProgramSubTypeDDPCnl 0xca00+STD_BETA_DECODE,0x3707 | ||
1962 | |||
1953 | #define wroteDECSourceDecodeUnknown 0xca00+STD_BETA_DECODE,0x0b00 | 1963 | #define wroteDECSourceDecodeUnknown 0xca00+STD_BETA_DECODE,0x0b00 |
1954 | #define wroteDECSourceDecodeNone 0xca00+STD_BETA_DECODE,0x0b01 | 1964 | #define wroteDECSourceDecodeNone 0xca00+STD_BETA_DECODE,0x0b01 |
1955 | #define wroteDECSourceDecodePass 0xca00+STD_BETA_DECODE,0x0b02 | 1965 | #define wroteDECSourceDecodePass 0xca00+STD_BETA_DECODE,0x0b02 |
diff --git a/pa/f/include/pafdec.h b/pa/f/include/pafdec.h index b0fad77..aeddda2 100644 --- a/pa/f/include/pafdec.h +++ b/pa/f/include/pafdec.h | |||
@@ -86,7 +86,8 @@ typedef volatile struct PAF_DecodeStatus { | |||
86 | XDAS_Int8 bufferRatio;//50 | 86 | XDAS_Int8 bufferRatio;//50 |
87 | XDAS_Int8 emphasis;//51 | 87 | XDAS_Int8 emphasis;//51 |
88 | XDAS_Int16 bufferDrift;//52 | 88 | XDAS_Int16 bufferDrift;//52 |
89 | XDAS_Int8 Unused7[2];//can be used, added for allignment | 89 | XDAS_Int8 Unused7[1];//can be used, added for allignment |
90 | XDAS_Int8 sourceProgram_subType;//55 | ||
90 | PAF_ChannelConfiguration channelConfigurationRequest;//56 | 91 | PAF_ChannelConfiguration channelConfigurationRequest;//56 |
91 | PAF_ChannelConfiguration channelConfigurationProgram;//64 | 92 | PAF_ChannelConfiguration channelConfigurationProgram;//64 |
92 | PAF_ChannelConfiguration channelConfigurationDecode;//72 | 93 | PAF_ChannelConfiguration channelConfigurationDecode;//72 |
@@ -131,6 +132,18 @@ enum PAF_SOURCE { | |||
131 | PAF_SOURCE_N | 132 | PAF_SOURCE_N |
132 | }; | 133 | }; |
133 | 134 | ||
135 | enum PAF_SOURCE_SUBTYPE { | ||
136 | PAF_SOURCE_SUBTYPE_UNKNOWN, | ||
137 | PAF_SOURCE_SUBTYPE_NONE, | ||
138 | PAF_SOURCE_MATPCM_OBJ, | ||
139 | PAF_SOURCE_MATPCM_CNL, | ||
140 | PAF_SOURCE_MATTHD_OBJ, | ||
141 | PAF_SOURCE_MATTHD_CNL, | ||
142 | PAF_SOURCE_DDP_OBJ, | ||
143 | PAF_SOURCE_DDP_CNL, | ||
144 | PAF_SOURCE_SUBTYPE_N | ||
145 | }; | ||
146 | |||
134 | #define PAF_SOURCE_DTS11 PAF_SOURCE_DTS | 147 | #define PAF_SOURCE_DTS11 PAF_SOURCE_DTS |
135 | 148 | ||
136 | enum PAF_SOURCE_DUAL { | 149 | enum PAF_SOURCE_DUAL { |