APSS init support

Change-Id: I57df832e0611a097eac5285f52366061be091343
RTC:133242
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20250
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Tested-by: William A. Bryan <wilbryan@us.ibm.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/occ_405/pss/apss.c b/src/occ_405/pss/apss.c
index 77a111f..fa08af8 100755
--- a/src/occ_405/pss/apss.c
+++ b/src/occ_405/pss/apss.c
@@ -44,14 +44,14 @@
 // Configure both GPIOs (directoin/drive/interrupts): All Input, All 1's, No Interrupts
 const apssGpioConfigStruct_t G_gpio_config[2] = { {0x00, 0xFF, 0x00}, {0x00, 0xFF, 0x00} };
 
-// Configure streaming of: 16 ADCs, 2 GPIOs
-const apssCompositeConfigStruct_t G_apss_composite_config = { 16, 2 };
+// Configure streaming of: APSS Mode, 16 ADCs, 2 GPIOs
+const apssModeConfigStruct_t G_apss_mode_config = { APSS_MODE_AUTO2, 16, 2 };
 
 // Power Measurements (read from APSS every RealTime loop)
 apssPwrMeasStruct_t G_apss_pwr_meas = { {0} };
 
 GPE_BUFFER(initGpioArgs_t G_gpe_apss_initialize_gpio_args);
-GPE_BUFFER(setCompositeModeArgs_t G_gpe_apss_set_composite_mode_args);
+GPE_BUFFER(setApssModeArgs_t G_gpe_apss_set_mode_args);
 
 uint64_t G_gpe_apss_time_start;
 uint64_t G_gpe_apss_time_end;
@@ -637,14 +637,14 @@ void reformat_meas_data()
 
             // Copy measurements into correct struction locations (based on composite config)
             uint16_t l_index = 0;
-            memcpy(G_apss_pwr_meas.adc, &l_buffer[l_index], (G_apss_composite_config.numAdcChannelsToRead * 2));
-            l_index += (G_apss_composite_config.numAdcChannelsToRead * 2);
-            memcpy(G_apss_pwr_meas.gpio, &l_buffer[l_index], (G_apss_composite_config.numGpioPortsToRead * 2));
+            memcpy(G_apss_pwr_meas.adc, &l_buffer[l_index], (G_apss_mode_config.numAdcChannelsToRead * 2));
+            l_index += (G_apss_mode_config.numAdcChannelsToRead * 2);
+            memcpy(G_apss_pwr_meas.gpio, &l_buffer[l_index], (G_apss_mode_config.numGpioPortsToRead * 2));
             // TOD is always located at same offset
             memcpy(&G_apss_pwr_meas.tod, &l_buffer[l_continue_meas_length+l_complete_meas_length-8], 8);
 
-            APSS_DBG("...into structure: (%d ADC, %d GPIO)\n", G_apss_composite_config.numAdcChannelsToRead,
-                G_apss_composite_config.numGpioPortsToRead);
+            APSS_DBG("...into structure: (%d ADC, %d GPIO)\n", G_apss_mode_config.numAdcChannelsToRead,
+                G_apss_mode_config.numGpioPortsToRead);
             APSS_DBG_HEXDUMP(&G_apss_pwr_meas, sizeof(G_apss_pwr_meas), "G_apss_pwr_meas");
         }
 
diff --git a/src/occ_405/pss/apss.h b/src/occ_405/pss/apss.h
index 482919e..a332bea 100644
--- a/src/occ_405/pss/apss.h
+++ b/src/occ_405/pss/apss.h
@@ -67,11 +67,11 @@ struct apssPwrMeasStruct
 } __attribute__ ((__packed__));
 typedef struct apssPwrMeasStruct apssPwrMeasStruct_t;
 
-// @TODO - Does G_gpio_config and G_apss_composite_config need to be used outside of APSS?  If not I will remove from .h
+// @TODO - Does G_gpio_config and G_apss_mode_config need to be used outside of APSS?  If not I will remove from .h
 // G_gpio_config: configuration for APSS GPIO pins (default all input, all 1's, not int)
 extern const apssGpioConfigStruct_t G_gpio_config[NUM_OF_APSS_GPIO_PORTS];
-// G_apss_composite_config: system parms needed to select correct composite command options
-extern const apssCompositeConfigStruct_t G_apss_composite_config;
+// G_apss_mode_config: system parms needed to select correct mode command options
+extern const apssModeConfigStruct_t G_apss_mode_config;
 
 // G_apss_pwr_meas: power, temp and GPIO readings that OCC gathers from APSS every tick
 extern apssPwrMeasStruct_t G_apss_pwr_meas;
@@ -80,7 +80,7 @@ extern apssPwrMeasStruct_t G_apss_pwr_meas;
 extern volatile bool G_ApssPwrMeasCompleted;
 
 extern initGpioArgs_t G_gpe_apss_initialize_gpio_args;
-extern setCompositeModeArgs_t G_gpe_apss_set_composite_mode_args;
+extern setApssModeArgs_t G_gpe_apss_set_mode_args;
 
 extern uint64_t G_gpe_apss_time_start;
 extern uint64_t G_gpe_apss_time_end;