Update for DHv1.2 full speaker support

6 files changed, 118 insertions, 6 deletions

diff --git a/pa/f/Makefile b/pa/f/Makefile
index 87f87be..57ab5f6 100644
--- a/pa/f/Makefile
+++ b/pa/f/Makefile
@@ -57,6 +57,7 @@ LIBNAME=fwk
 # architecture dependent settings (must come first)
 ifeq (${ARCH},c674x)
 DEFINES  += -d"dMAX_CFG=dMAX_CFG1"
+DEFINES  += -d"FULL_SPEAKER"
 DEFINES  += -d"DAP_CACHE_SUPPORT"
 INCLUDES += -I"../../../../da/dmax/v0/da8xx"
 vpath %.c $(SRCDIR)/../../da/dmax/v0/da8xx
diff --git a/pa/f/alpha/pafsys_a.h b/pa/f/alpha/pafsys_a.h
index 607eb7b..eff497d 100644
--- a/pa/f/alpha/pafsys_a.h
+++ b/pa/f/alpha/pafsys_a.h
@@ -108,6 +108,19 @@
 #define  readSYSspeakerFrontheight 0xc200+STD_BETA_SYSIDL,0x1D00
 #define  readSYSspeakerRearheight 0xc200+STD_BETA_SYSIDL,0x1E00
 
+#ifdef FULL_SPEAKER
+#define  readSYSspeakerScreen 0xc200+STD_BETA_SYSIDL,0x2800
+
+#define  readSYSSurr1 0xc200+STD_BETA_SYSIDL,0x2900
+#define  readSYSSurr2 0xc200+STD_BETA_SYSIDL,0x2a00
+#define  readSYSRearSurr1 0xc200+STD_BETA_SYSIDL,0x2b00
+#define  readSYSRearSurr2 0xc200+STD_BETA_SYSIDL,0x2c00
+#define  readSYSCntrSurr 0xc200+STD_BETA_SYSIDL,0x2d00
+#define  readSYSLRCntr 0xc200+STD_BETA_SYSIDL,0x2e00
+#define  readSYSLRCntrSurr 0xc200+STD_BETA_SYSIDL,0x2f00
+
+#endif
+
 #define writeSYSModeDisable 0xca00+STD_BETA_SYSIDL,0x0400
 #define writeSYSModeEnable 0xca00+STD_BETA_SYSIDL,0x047f
 #define writeSYSModeN(NN) 0xca00+STD_BETA_SYSIDL,0x0400+((NN)&0xff)
@@ -174,6 +187,40 @@
 #define writeSYSSpeakerRearheightSmall2 0xca00+STD_BETA_SYSIDL,0x1E22
 #define writeSYSSpeakerRearheightLarge2 0xca00+STD_BETA_SYSIDL,0x1E32
 
+#ifdef FULL_SPEAKER
+#define writeSYSSpeakerScreenNone 0xca00+STD_BETA_SYSIDL,0x2800
+#define writeSYSSpeakerScreenSmall2 0xca00+STD_BETA_SYSIDL,0x2822
+#define writeSYSSpeakerScreenLarge2 0xca00+STD_BETA_SYSIDL,0x2832
+
+#define writeSYSSurr1None 0xca00+STD_BETA_SYSIDL,0x2900
+#define writeSYSSurr1Small2 0xca00+STD_BETA_SYSIDL,0x2922
+#define writeSYSSurr1Large2 0xca00+STD_BETA_SYSIDL,0x2932
+
+#define writeSYSSurr2None 0xca00+STD_BETA_SYSIDL,0x2a00
+#define writeSYSSurr2Small2 0xca00+STD_BETA_SYSIDL,0x2a22
+#define writeSYSSurr2Large2 0xca00+STD_BETA_SYSIDL,0x2a32
+
+#define writeSYSRearSurr1None 0xca00+STD_BETA_SYSIDL,0x2b00
+#define writeSYSRearSurr1Small2 0xca00+STD_BETA_SYSIDL,0x2b22
+#define writeSYSRearSurr1Large2 0xca00+STD_BETA_SYSIDL,0x2b32
+
+#define writeSYSRearSurr2None 0xca00+STD_BETA_SYSIDL,0x2c00
+#define writeSYSRearSurr2Small2 0xca00+STD_BETA_SYSIDL,0x2c22
+#define writeSYSRearSurr2Large2 0xca00+STD_BETA_SYSIDL,0x2c32
+
+#define writeSYSCntrSurrNone 0xca00+STD_BETA_SYSIDL,0x2d00
+#define writeSYSCntrSurrSmall1 0xca00+STD_BETA_SYSIDL,0x2d21
+#define writeSYSCntrSurrLarge1 0xca00+STD_BETA_SYSIDL,0x2d31
+
+#define writeSYSLRCntrNone 0xca00+STD_BETA_SYSIDL,0x2e00
+#define writeSYSLRCntrSmall2 0xca00+STD_BETA_SYSIDL,0x2e22
+#define writeSYSLRCntrLarge2 0xca00+STD_BETA_SYSIDL,0x2e32
+
+#define writeSYSLRCntrSurrNone 0xca00+STD_BETA_SYSIDL,0x2f00
+#define writeSYSLRCntrSurrSmall2 0xca00+STD_BETA_SYSIDL,0x2f22
+#define writeSYSLRCntrSurrLarge2 0xca00+STD_BETA_SYSIDL,0x2f32
+#endif
+
 #define writeSYSChannelConfigurationRequestTypeStandard 0xca00+STD_BETA_SYSIDL,0x0c00
 #define writeSYSChannelConfigurationRequestTypeDecodeBypass 0xca00+STD_BETA_SYSIDL,0x0c01
 #define writeSYSChannelConfigurationRequestTypeDecodeDirect 0xca00+STD_BETA_SYSIDL,0x0c02
diff --git a/pa/f/alpha/paftyp_a.h b/pa/f/alpha/paftyp_a.h
index 7d165ed..e25e302 100644
--- a/pa/f/alpha/paftyp_a.h
+++ b/pa/f/alpha/paftyp_a.h
@@ -53,6 +53,9 @@
 #define ATMOS
 #endif 
 
+#ifndef FULL_SPEAKER
+#define FULL_SPEAKER
+#endif 
 // PA/F Extended channels:
 
 #define PAF_MAXNUMCHAN_HD 32
@@ -176,10 +179,19 @@
 #define PAF_WIDE   4
 #define PAF_LWID   4
 #define PAF_RWID   5
+
+#ifdef FULL_SPEAKER
+#define PAF_LTRR   18
+#define PAF_RTRR   19
+#define PAF_LTRH   20
+#define PAF_RTRH   21
+#else
 #define PAF_LTRR   4
 #define PAF_RTRR   5
 #define PAF_LTRH   4
 #define PAF_RTRH   5
+#endif
+
 #define PAF_OVER   6
 #define PAF_LOVR   6
 #define PAF_ROVR   7
@@ -199,8 +211,15 @@
 #define PAF_RHED   15
 #define PAF_LTFT   14
 #define PAF_RTFT   15
+
+#ifdef FULL_SPEAKER
+#define PAF_LTFH   16
+#define PAF_RTFH   17
+#else
 #define PAF_LTFH   14
 #define PAF_RTFH   15
+#endif
+
 #define PAF_FRNT_0 0
 #define PAF_FRNT_N 8
 #define PAF_REAR_0 8
@@ -252,10 +271,19 @@
 #define PAF_WIDE   4
 #define PAF_LWID   4
 #define PAF_RWID   5
+
+#ifdef FULL_SPEAKER
+#define PAF_LTRR   4
+#define PAF_RTRR   5
+#define PAF_LTRH   20
+#define PAF_RTRH   21
+#else
 #define PAF_LTRR   4
 #define PAF_RTRR   5
 #define PAF_LTRH   4
 #define PAF_RTRH   5
+#endif
+
 #define PAF_OVER   6
 #define PAF_LOVR   6
 #define PAF_ROVR   7
@@ -275,8 +303,15 @@
 #define PAF_RHED   15
 #define PAF_LTFT   14
 #define PAF_RTFT   15
+
+#ifdef FULL_SPEAKER
+#define PAF_LTFH   3
+#define PAF_RTFH   22
+#else
 #define PAF_LTFH   14
 #define PAF_RTFH   15
+#endif
+
 #define PAF_FRNT_0 0
 #define PAF_FRNT_N 8
 #define PAF_REAR_0 8
diff --git a/pa/f/include/pafsys.h b/pa/f/include/pafsys.h
index 779377e..ee74993 100644
--- a/pa/f/include/pafsys.h
+++ b/pa/f/include/pafsys.h
@@ -67,11 +67,21 @@ typedef volatile struct PAF_SystemStatus {
     XDAS_UInt8 speakerHead;
     XDAS_UInt8 speakerTopfront;
     XDAS_UInt8 speakerToprear;
-        XDAS_UInt8 speakerTopmiddle;
-        XDAS_UInt8 speakerFrontheight;
-        XDAS_UInt8 speakerRearheight;
-        XDAS_UInt8 unused2;//To make 64 bit alligned
+    XDAS_UInt8 speakerTopmiddle;
+    XDAS_UInt8 speakerFrontheight;
+    XDAS_UInt8 speakerRearheight;
+    XDAS_UInt8 unused2;//To make 64 bit alligned
     PAF_ChannelConfiguration channelConfigurationRequest;
+#ifdef FULL_SPEAKER
+    XDAS_UInt8 speakerScreen;//0x28
+    XDAS_UInt8 speakerSurr1;//0x29
+    XDAS_UInt8 speakerSurr2;//0x2a
+    XDAS_UInt8 speakerRearSurr1;//0x2b
+    XDAS_UInt8 speakerRearSurr2;//0x2c
+    XDAS_UInt8 speakerCntrSurr;//0x2d
+    XDAS_UInt8 speakerLRCntr;//0x2e
+    XDAS_UInt8 speakerLRCntrSurr;//0x2f
+#endif
 } PAF_SystemStatus;
 
 typedef volatile struct PAF_ErrorStatus {
diff --git a/pa/f/include/paftyp.h b/pa/f/include/paftyp.h
index beed5cf..530552d 100644
--- a/pa/f/include/paftyp.h
+++ b/pa/f/include/paftyp.h
@@ -39,6 +39,9 @@
 //
 //
 //
+#ifndef FULL_SPEAKER
+#define FULL_SPEAKER
+#endif
 
 #ifndef PAFTYP_
 #define PAFTYP_
diff --git a/pa/f/s3/ss0.c b/pa/f/s3/ss0.c
index 4281f94..ca5edf3 100644
--- a/pa/f/s3/ss0.c
+++ b/pa/f/s3/ss0.c
@@ -73,6 +73,10 @@ extern int L3RAM;
 #endif
 #endif /* RAM_REPORT */
 
+#ifndef FULL_SPEAKER
+#define FULL_SPEAKER
+#endif
+
 //
 // systemStream : audio stream control function (main)
 //
@@ -232,8 +236,20 @@ systemStream1Compute (const PAF_SST_Params *pP, PAF_SST_Config *pC, long long x[
         ccr.part.sub = (pStatus->speakerSubw & PAF_SYS_SPEAKERNUMB);
         ccr.part.extMask =
             ((pStatus->speakerWide & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LwRw : 0)
-          | ((pStatus->speakerHead & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LhRh : 0) ;
-
+#ifdef FULL_SPEAKER
+          | ((pStatus->speakerLRCntr & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LcRc : 0)
+#endif
+          | ((pStatus->speakerHead & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LhRh : 0);
+#ifdef FULL_SPEAKER
+        ccr.part.extMask2 =
+                    ((pStatus->speakerCntrSurr & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_Cs : 0)
+                  | ((pStatus->speakerLRCntrSurr & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LcsRcs : 0)
+                          | ((pStatus->speakerRearSurr2 & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_Lrs2Rrs2 : 0)
+                          | ((pStatus->speakerRearSurr1 & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_Lrs1Rrs1 : 0)
+                          | ((pStatus->speakerSurr2 & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_Ls2Rs2 : 0)
+                          | ((pStatus->speakerSurr1 & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_Ls1Rs1 : 0)
+                  | ((pStatus->speakerScreen & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LscRsc : 0);
+#endif
         ccr.part.extMask3 =
                     ((pStatus->speakerTopfront & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LtfRtf : 0)
                   | ((pStatus->speakerToprear & PAF_SYS_SPEAKERNUMB) ? PAF_CC_EXTMASK_LtrRtr : 0)