summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Godbey2016-08-01 14:19:42 -0500
committerJohn Godbey2016-08-01 14:19:42 -0500
commit64b92ffd11d6c52d8a146b5264b7fa10fa504f5d (patch)
treebd6131187c0dc0aa0431a803e95a639f6e6e8be2
parent8eaa5d6a3c7aceb1521bf720f87b279072ab3590 (diff)
downloadaudk2g-addon-64b92ffd11d6c52d8a146b5264b7fa10fa504f5d.tar.gz
audk2g-addon-64b92ffd11d6c52d8a146b5264b7fa10fa504f5d.tar.xz
audk2g-addon-64b92ffd11d6c52d8a146b5264b7fa10fa504f5d.zip
cleaning up warnings
Signed-off-by: John Godbey <j-godbey@ti.com>
-rw-r--r--include/evmc66x_gpio.h16
-rw-r--r--include/evmc66x_i2c.h4
-rw-r--r--src/audk2g.c112
-rw-r--r--src/evmc66x_gpio.c42
-rw-r--r--src/evmc66x_i2c.c78
-rw-r--r--src/evmc66x_pinmux.c5
6 files changed, 123 insertions, 134 deletions
diff --git a/include/evmc66x_gpio.h b/include/evmc66x_gpio.h
index 2f68099..1fdeb64 100644
--- a/include/evmc66x_gpio.h
+++ b/include/evmc66x_gpio.h
@@ -408,7 +408,7 @@ typedef enum _GpioDirection
408 * \return CSL_GpioHandle\n 408 * \return CSL_GpioHandle\n
409 * 409 *
410 */ 410 */
411CSL_GpioHandle gpioGetRegBaseAddr(uint8_t gpioPortNumber); 411CSL_GpioHandle audk2g_gpioGetRegBaseAddr(uint8_t gpioPortNumber);
412 412
413/** 413/**
414 * \brief Initializes the GPIO peripheral 414 * \brief Initializes the GPIO peripheral
@@ -420,7 +420,7 @@ CSL_GpioHandle gpioGetRegBaseAddr(uint8_t gpioPortNumber);
420 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 420 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
421 * 421 *
422 */ 422 */
423AUDK2G_GPIO_RET gpioInit(uint8_t gpioPortNumber); 423AUDK2G_GPIO_RET audk2g_gpioInit(uint8_t gpioPortNumber);
424 424
425/** 425/**
426 * \brief This function configures the specified GPIO's direction 426 * \brief This function configures the specified GPIO's direction
@@ -491,7 +491,7 @@ uint32_t audk2g_gpioReadInput(uint8_t gpioPortNumber, uint8_t pinNum);
491 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 491 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
492 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number 492 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number
493 */ 493 */
494AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum); 494AUDK2G_GPIO_RET audk2g_gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum);
495 495
496/** 496/**
497 * \brief This function Disables GPIO interrupts to CPU 497 * \brief This function Disables GPIO interrupts to CPU
@@ -504,7 +504,7 @@ AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNu
504 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 504 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
505 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number 505 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number
506 */ 506 */
507AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum); 507AUDK2G_GPIO_RET audk2g_gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum);
508 508
509/** 509/**
510 * \brief This function sets specified GPIO's rising edge interrupt 510 * \brief This function sets specified GPIO's rising edge interrupt
@@ -517,7 +517,7 @@ AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankN
517 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 517 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
518 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 518 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
519 */ 519 */
520AUDK2G_GPIO_RET gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum); 520AUDK2G_GPIO_RET audk2g_gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum);
521 521
522/** 522/**
523 * \brief This function clears specified GPIO's rising edge interrupt 523 * \brief This function clears specified GPIO's rising edge interrupt
@@ -530,7 +530,7 @@ AUDK2G_GPIO_RET gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNu
530 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 530 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
531 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 531 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
532 */ 532 */
533AUDK2G_GPIO_RET gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum); 533AUDK2G_GPIO_RET audk2g_gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum);
534 534
535/** 535/**
536 * \brief This function sets specified GPIO's falling edge interrupt 536 * \brief This function sets specified GPIO's falling edge interrupt
@@ -543,7 +543,7 @@ AUDK2G_GPIO_RET gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pin
543 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 543 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
544 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 544 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
545 */ 545 */
546AUDK2G_GPIO_RET gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum); 546AUDK2G_GPIO_RET audk2g_gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum);
547 547
548/** 548/**
549 * \brief This function clears specified GPIO's falling edge interrupt 549 * \brief This function clears specified GPIO's falling edge interrupt
@@ -556,7 +556,7 @@ AUDK2G_GPIO_RET gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinN
556 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 556 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
557 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 557 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
558 */ 558 */
559AUDK2G_GPIO_RET gpioClearFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum); 559AUDK2G_GPIO_RET audk2g_gpioClearFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum);
560 560
561#endif /* _EVMC66X_AUDK2G_GPIO_H_ */ 561#endif /* _EVMC66X_AUDK2G_GPIO_H_ */
562 562
diff --git a/include/evmc66x_i2c.h b/include/evmc66x_i2c.h
index c00d8c6..c689214 100644
--- a/include/evmc66x_i2c.h
+++ b/include/evmc66x_i2c.h
@@ -191,7 +191,7 @@ typedef uint16_t I2C_RET;
191/************************ 191/************************
192 * Function declarations 192 * Function declarations
193 ************************/ 193 ************************/
194CSL_I2cRegs* i2cGetRegBaseAddr(uint8_t i2cPortNumber); 194CSL_I2cRegs* audk2g_i2cGetRegBaseAddr(uint8_t i2cPortNumber);
195#if 0 195#if 0
196void evmI2CInit(uint8_t i2cportnumber ); 196void evmI2CInit(uint8_t i2cportnumber );
197#endif 197#endif
@@ -208,7 +208,7 @@ I2C_RET audk2g_i2cWriteLong( uint8_t i2cPortNumber, uint8_t slaveAddress,
208 uint32_t numBytes, uint32_t endBusState); 208 uint32_t numBytes, uint32_t endBusState);
209#endif 209#endif
210void audk2g_delaycycles(uint32_t cycles); 210void audk2g_delaycycles(uint32_t cycles);
211void i2cDelay (uint32_t count); 211void audk2g_i2cDelay (uint32_t count);
212#if 0 212#if 0
213I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveI2cAddress, 213I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveI2cAddress,
214 uint32_t offset, uint8_t *pData, uint32_t numBytes); 214 uint32_t offset, uint8_t *pData, uint32_t numBytes);
diff --git a/src/audk2g.c b/src/audk2g.c
index ac20c1d..b8acd50 100644
--- a/src/audk2g.c
+++ b/src/audk2g.c
@@ -257,7 +257,7 @@ Audk2g_STATUS audk2g_AudioAdcInit(AdcDevId devId)
257 257
258 IFPRINT(audk2g_write("audk2g_AudioAdcInit Called \n")); 258 IFPRINT(audk2g_write("audk2g_AudioAdcInit Called \n"));
259 259
260 if(!((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL))) 260 if(!(devId <= AUDK2G_ADC_DEVICE_ALL))
261 { 261 {
262 IFPRINT(audk2g_write("audk2g_AudioAdcInit : Invalid Inputs\n")); 262 IFPRINT(audk2g_write("audk2g_AudioAdcInit : Invalid Inputs\n"));
263 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 263 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -300,7 +300,7 @@ Audk2g_STATUS audk2g_AudioAdcReset(AdcDevId devId)
300 300
301 IFPRINT(audk2g_write("audk2g_AudioAdcReset Called \n")); 301 IFPRINT(audk2g_write("audk2g_AudioAdcReset Called \n"));
302 302
303 if(!((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL))) 303 if(!(devId <= AUDK2G_ADC_DEVICE_ALL))
304 { 304 {
305 IFPRINT(audk2g_write("audk2g_AudioAdcReset : Invalid Inputs\n")); 305 IFPRINT(audk2g_write("audk2g_AudioAdcReset : Invalid Inputs\n"));
306 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 306 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -352,8 +352,8 @@ Audk2g_STATUS audk2g_AudioAdcSetGain(AdcDevId devId,
352 352
353 IFPRINT(audk2g_write("audk2g_AudioAdcSetGain Called \n")); 353 IFPRINT(audk2g_write("audk2g_AudioAdcSetGain Called \n"));
354 354
355 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 355 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
356 ((chanId >= AUDK2G_ADC_CH1_LEFT) && (chanId <= AUDK2G_ADC_CH_ALL)) && 356 (chanId <= AUDK2G_ADC_CH_ALL) &&
357 (gain <= 100) ) ) 357 (gain <= 100) ) )
358 { 358 {
359 IFPRINT(audk2g_write("audk2g_AudioAdcSetGain : Invalid Inputs\n")); 359 IFPRINT(audk2g_write("audk2g_AudioAdcSetGain : Invalid Inputs\n"));
@@ -411,11 +411,10 @@ Audk2g_STATUS audk2g_AudioAdcSetLeftInputMux(AdcDevId devId,
411 411
412 IFPRINT(audk2g_write("audk2g_AudioAdcSetLeftInputMux Called \n")); 412 IFPRINT(audk2g_write("audk2g_AudioAdcSetLeftInputMux Called \n"));
413 413
414 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 414 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
415 ((chanId == AUDK2G_ADC_CH1_LEFT) || (chanId == AUDK2G_ADC_CH2_LEFT) || 415 ((chanId == AUDK2G_ADC_CH1_LEFT) || (chanId == AUDK2G_ADC_CH2_LEFT) ||
416 (chanId == AUDK2G_ADC_CH_ALL)) && 416 (chanId == AUDK2G_ADC_CH_ALL)) &&
417 ((inputMux >= AUDK2G_ADC_INL_NONE) && 417 ((inputMux <= AUDK2G_ADC_INL_DIFF_VIN1P_VIN1M_VIN4P_VIN4M)) ) )
418 (inputMux <= AUDK2G_ADC_INL_DIFF_VIN1P_VIN1M_VIN4P_VIN4M)) ) )
419 { 418 {
420 IFPRINT(audk2g_write("audk2g_AudioAdcSetLeftInputMux : Invalid Inputs\n")); 419 IFPRINT(audk2g_write("audk2g_AudioAdcSetLeftInputMux : Invalid Inputs\n"));
421 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 420 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -490,11 +489,10 @@ Audk2g_STATUS audk2g_AudioAdcSetRightInputMux(AdcDevId devId,
490 489
491 IFPRINT(audk2g_write("audk2g_AudioAdcSetRightInputMux Called \n")); 490 IFPRINT(audk2g_write("audk2g_AudioAdcSetRightInputMux Called \n"));
492 491
493 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 492 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
494 ((chanId == AUDK2G_ADC_CH1_RIGHT) || (chanId == AUDK2G_ADC_CH2_RIGHT) || 493 ((chanId == AUDK2G_ADC_CH1_RIGHT) || (chanId == AUDK2G_ADC_CH2_RIGHT) ||
495 (chanId == AUDK2G_ADC_CH_ALL)) && 494 (chanId == AUDK2G_ADC_CH_ALL)) &&
496 ((inputMux >= AUDK2G_ADC_INR_NONE) && 495 ((inputMux <= AUDK2G_ADC_INR_DIFF_VIN2P_VIN2M_VIN3P_VIN3M)) ) )
497 (inputMux <= AUDK2G_ADC_INR_DIFF_VIN2P_VIN2M_VIN3P_VIN3M)) ) )
498 { 496 {
499 IFPRINT(audk2g_write("audk2g_AudioAdcSetRightInputMux : Invalid Inputs\n")); 497 IFPRINT(audk2g_write("audk2g_AudioAdcSetRightInputMux : Invalid Inputs\n"));
500 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 498 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -562,10 +560,9 @@ Audk2g_STATUS audk2g_AudioAdcDataConfig(AdcDevId devId,
562 560
563 IFPRINT(audk2g_write("audk2g_AudioAdcDataConfig Called \n")); 561 IFPRINT(audk2g_write("audk2g_AudioAdcDataConfig Called \n"));
564 562
565 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 563 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
566 ((wLen >= AUDK2G_ADC_RX_WLEN_24BIT) && (wLen <= AUDK2G_ADC_RX_WLEN_16BIT)) && 564 ((wLen >= AUDK2G_ADC_RX_WLEN_24BIT) && (wLen <= AUDK2G_ADC_RX_WLEN_16BIT)) &&
567 ((format >= AUDK2G_ADC_DATA_FORMAT_I2S) && 565 ((format <= AUDK2G_ADC_DATA_FORMAT_TDM_DSP)) ) )
568 (format <= AUDK2G_ADC_DATA_FORMAT_TDM_DSP)) ) )
569 { 566 {
570 IFPRINT(audk2g_write("audk2g_AudioAdcDataConfig : Invalid Inputs\n")); 567 IFPRINT(audk2g_write("audk2g_AudioAdcDataConfig : Invalid Inputs\n"));
571 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 568 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -619,8 +616,8 @@ Audk2g_STATUS audk2g_AudioAdcMuteCtrl(AdcDevId devId,
619 616
620 IFPRINT(audk2g_write("audk2g_AudioAdcMuteCtrl Called \n")); 617 IFPRINT(audk2g_write("audk2g_AudioAdcMuteCtrl Called \n"));
621 618
622 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 619 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
623 ((chanId >= AUDK2G_ADC_CH1_LEFT) && (chanId <= AUDK2G_ADC_CH_ALL)) && 620 (chanId <= AUDK2G_ADC_CH_ALL) &&
624 ((muteEnable == 0) || (muteEnable == 1)) ) ) 621 ((muteEnable == 0) || (muteEnable == 1)) ) )
625 { 622 {
626 IFPRINT(audk2g_write("audk2g_AudioAdcMuteCtrl : Invalid Inputs\n")); 623 IFPRINT(audk2g_write("audk2g_AudioAdcMuteCtrl : Invalid Inputs\n"));
@@ -678,7 +675,7 @@ Audk2g_STATUS audk2g_AudioAdcMicBiasCtrl(AdcDevId devId,
678 675
679 IFPRINT(audk2g_write("audk2g_AudioAdcMicBiasCtrl Called \n")); 676 IFPRINT(audk2g_write("audk2g_AudioAdcMicBiasCtrl Called \n"));
680 677
681 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 678 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
682 ((micBiasEnable == 0) || (micBiasEnable == 1)) ) ) 679 ((micBiasEnable == 0) || (micBiasEnable == 1)) ) )
683 { 680 {
684 IFPRINT(audk2g_write("audk2g_AudioAdcMicBiasCtrl : Invalid Inputs\n")); 681 IFPRINT(audk2g_write("audk2g_AudioAdcMicBiasCtrl : Invalid Inputs\n"));
@@ -729,9 +726,8 @@ Audk2g_STATUS audk2g_AudioAdcConfigPowState(AdcDevId devId,
729 726
730 IFPRINT(audk2g_write("audk2g_AudioAdcConfigPowState Called \n")); 727 IFPRINT(audk2g_write("audk2g_AudioAdcConfigPowState Called \n"));
731 728
732 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 729 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
733 ((powState >= AUDK2G_ADC_POWER_STATE_STANDBY) && 730 (powState <= AUDK2G_ADC_POWER_STATE_POWERDOWN) &&
734 (powState <= AUDK2G_ADC_POWER_STATE_POWERDOWN)) &&
735 ((stateEnable == 0) || (stateEnable == 1)) ) ) 731 ((stateEnable == 0) || (stateEnable == 1)) ) )
736 { 732 {
737 IFPRINT(audk2g_write("audk2g_AudioAdcConfigPowState : Invalid Inputs\n")); 733 IFPRINT(audk2g_write("audk2g_AudioAdcConfigPowState : Invalid Inputs\n"));
@@ -785,8 +781,8 @@ Audk2g_STATUS audk2g_AudioAdcConfigIntr(AdcDevId devId,
785 781
786 IFPRINT(audk2g_write("audk2g_AudioAdcConfigIntr Called \n")); 782 IFPRINT(audk2g_write("audk2g_AudioAdcConfigIntr Called \n"));
787 783
788 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 784 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
789 ((intId >= AUDK2G_ADC_INTR_ENERGY_SENSE) && (intId <= AUDK2G_ADC_INTR_ALL)) && 785 (intId <= AUDK2G_ADC_INTR_ALL) &&
790 ((intEnable == 0) || (intEnable == 1)) ) ) 786 ((intEnable == 0) || (intEnable == 1)) ) )
791 { 787 {
792 IFPRINT(audk2g_write("audk2g_AudioAdcConfigIntr : Invalid Inputs\n")); 788 IFPRINT(audk2g_write("audk2g_AudioAdcConfigIntr : Invalid Inputs\n"));
@@ -835,8 +831,8 @@ uint8_t audk2g_AudioAdcGetIntrStatus(AdcDevId devId,
835 831
836 IFPRINT(audk2g_write("audk2g_AudioAdcGetIntrStatus Called \n")); 832 IFPRINT(audk2g_write("audk2g_AudioAdcGetIntrStatus Called \n"));
837 833
838 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_1)) && 834 if( !( ((devId <= AUDK2G_ADC_DEVICE_1)) &&
839 ((intId >= AUDK2G_ADC_INTR_ENERGY_SENSE) && (intId <= AUDK2G_ADC_INTR_ALL)) ) ) 835 (intId <= AUDK2G_ADC_INTR_ALL) ) )
840 { 836 {
841 IFPRINT(audk2g_write("audk2g_AudioAdcGetIntrStatus : Invalid Inputs\n")); 837 IFPRINT(audk2g_write("audk2g_AudioAdcGetIntrStatus : Invalid Inputs\n"));
842 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 838 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -879,9 +875,8 @@ uint8_t audk2g_AudioAdcGetStatus(AdcDevId devId,
879 875
880 IFPRINT(audk2g_write("audk2g_AudioAdcGetStatus Called \n")); 876 IFPRINT(audk2g_write("audk2g_AudioAdcGetStatus Called \n"));
881 877
882 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_1)) && 878 if( !( ((devId <= AUDK2G_ADC_DEVICE_1)) &&
883 ((status >= AUDK2G_ADC_STATUS_POWER_STATE) && 879 (status <= AUDK2G_ADC_STATUS_LDO) ) )
884 (status <= AUDK2G_ADC_STATUS_LDO)) ) )
885 { 880 {
886 IFPRINT(audk2g_write("audk2g_AudioAdcGetStatus : Invalid Inputs\n")); 881 IFPRINT(audk2g_write("audk2g_AudioAdcGetStatus : Invalid Inputs\n"));
887 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 882 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1055,7 +1050,7 @@ Audk2g_STATUS audk2g_AudioAdcDspCtrl(AdcDevId devId,
1055 1050
1056 IFPRINT(audk2g_write("audk2g_AudioAdcDspCtrl Called \n")); 1051 IFPRINT(audk2g_write("audk2g_AudioAdcDspCtrl Called \n"));
1057 1052
1058 if( !( ((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL)) && 1053 if( !( (devId <= AUDK2G_ADC_DEVICE_ALL) &&
1059 ((chanCfg == AUDK2G_ADC_DSP_PROC_4CHAN) || 1054 ((chanCfg == AUDK2G_ADC_DSP_PROC_4CHAN) ||
1060 (chanCfg == AUDK2G_ADC_DSP_PROC_2CHAN)) ) ) 1055 (chanCfg == AUDK2G_ADC_DSP_PROC_2CHAN)) ) )
1061 { 1056 {
@@ -1109,7 +1104,7 @@ Audk2g_STATUS audk2g_AudioAdcProgDspCoeff(AdcDevId devId,
1109 1104
1110 IFPRINT(audk2g_write("audk2g_AudioAdcProgDspCoeff Called \n")); 1105 IFPRINT(audk2g_write("audk2g_AudioAdcProgDspCoeff Called \n"));
1111 1106
1112 if(!((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL))) 1107 if(!(devId <= AUDK2G_ADC_DEVICE_ALL))
1113 { 1108 {
1114 IFPRINT(audk2g_write("audk2g_AudioAdcProgDspCoeff : Invalid Inputs\n")); 1109 IFPRINT(audk2g_write("audk2g_AudioAdcProgDspCoeff : Invalid Inputs\n"));
1115 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1110 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1155,7 +1150,7 @@ Audk2g_STATUS audk2g_AudioAdcGetRegDump(AdcDevId devId)
1155 1150
1156 IFPRINT(audk2g_write("audk2g_AudioAdcGetRegDump Called \n")); 1151 IFPRINT(audk2g_write("audk2g_AudioAdcGetRegDump Called \n"));
1157 1152
1158 if(!((devId >= AUDK2G_ADC_DEVICE_0) && (devId <= AUDK2G_ADC_DEVICE_ALL))) 1153 if(!(devId <= AUDK2G_ADC_DEVICE_ALL))
1159 { 1154 {
1160 IFPRINT(audk2g_write("audk2g_AudioAdcGetRegDump : Invalid Inputs\n")); 1155 IFPRINT(audk2g_write("audk2g_AudioAdcGetRegDump : Invalid Inputs\n"));
1161 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1156 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1208,7 +1203,7 @@ Audk2g_STATUS audk2g_AudioDacInit(DacDevId devId)
1208 1203
1209 IFPRINT(audk2g_write("audk2g_AudioDacInit Called \n")); 1204 IFPRINT(audk2g_write("audk2g_AudioDacInit Called \n"));
1210 1205
1211 if(!((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL))) 1206 if(!(devId <= DAC_DEVICE_ALL))
1212 { 1207 {
1213 IFPRINT(audk2g_write("audk2g_AudioDacInit : Invalid Inputs\n")); 1208 IFPRINT(audk2g_write("audk2g_AudioDacInit : Invalid Inputs\n"));
1214 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1209 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1252,7 +1247,7 @@ Audk2g_STATUS audk2g_AudioDacReset(DacDevId devId)
1252 IFPRINT(audk2g_write("audk2g_AudioDacReset Called \n")); 1247 IFPRINT(audk2g_write("audk2g_AudioDacReset Called \n"));
1253 1248
1254 /* Check input parameters */ 1249 /* Check input parameters */
1255 if(!((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL))) 1250 if(!(devId <= DAC_DEVICE_ALL))
1256 { 1251 {
1257 IFPRINT(audk2g_write("audk2g_AudioDacReset : Invalid Inputs\n")); 1252 IFPRINT(audk2g_write("audk2g_AudioDacReset : Invalid Inputs\n"));
1258 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1253 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1305,9 +1300,8 @@ Audk2g_STATUS audk2g_AudioDacAmuteCtrl(DacDevId devId,
1305 IFPRINT(audk2g_write("audk2g_AudioDacAmuteCtrl Called \n")); 1300 IFPRINT(audk2g_write("audk2g_AudioDacAmuteCtrl Called \n"));
1306 1301
1307 /* Check input parameters */ 1302 /* Check input parameters */
1308 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1303 if( !( (devId <= DAC_DEVICE_ALL) &&
1309 ((muteCtrl >= DAC_AMUTE_CTRL_SCKI_LOST) && 1304 (muteCtrl <= DAC_AMUTE_CTRL_DAC_DISABLE_CMD) &&
1310 (muteCtrl <= DAC_AMUTE_CTRL_DAC_DISABLE_CMD)) &&
1311 ((muteEnable == 0) || (muteEnable == 1)) ) ) 1305 ((muteEnable == 0) || (muteEnable == 1)) ) )
1312 { 1306 {
1313 IFPRINT(audk2g_write("audk2g_AudioDacAmuteCtrl : Invalid Inputs\n")); 1307 IFPRINT(audk2g_write("audk2g_AudioDacAmuteCtrl : Invalid Inputs\n"));
@@ -1369,9 +1363,8 @@ Audk2g_STATUS audk2g_AudioDacSetSamplingMode(DacDevId devId,
1369 IFPRINT(audk2g_write("audk2g_AudioDacSetSamplingMode Called \n")); 1363 IFPRINT(audk2g_write("audk2g_AudioDacSetSamplingMode Called \n"));
1370 1364
1371 /* Check input parameters */ 1365 /* Check input parameters */
1372 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1366 if( !( (devId <= DAC_DEVICE_ALL) &&
1373 ((samplingMode >= DAC_SAMPLING_MODE_AUTO) && 1367 (samplingMode <= DAC_SAMPLING_MODE_QUAD_RATE) ) )
1374 (samplingMode <= DAC_SAMPLING_MODE_QUAD_RATE)) ) )
1375 { 1368 {
1376 IFPRINT(audk2g_write("audk2g_AudioDacSetSamplingMode : Invalid Inputs\n")); 1369 IFPRINT(audk2g_write("audk2g_AudioDacSetSamplingMode : Invalid Inputs\n"));
1377 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1370 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1416,9 +1409,8 @@ Audk2g_STATUS audk2g_AudioDacSetDataFormat(DacDevId devId,
1416 IFPRINT(audk2g_write("audk2g_AudioDacSetDataFormat Called \n")); 1409 IFPRINT(audk2g_write("audk2g_AudioDacSetDataFormat Called \n"));
1417 1410
1418 /* Check input parameters */ 1411 /* Check input parameters */
1419 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1412 if( !( (devId <= DAC_DEVICE_ALL) &&
1420 ((dataFormat >= DAC_DATA_FORMAT_I2S) && 1413 (dataFormat <= DAC_DATA_FORMAT_24BIT_HS_LEFTJ_TDM) ) )
1421 (dataFormat <= DAC_DATA_FORMAT_24BIT_HS_LEFTJ_TDM)) ) )
1422 { 1414 {
1423 IFPRINT(audk2g_write("audk2g_AudioDacSetDataFormat : Invalid Inputs\n")); 1415 IFPRINT(audk2g_write("audk2g_AudioDacSetDataFormat : Invalid Inputs\n"));
1424 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1416 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1473,8 +1465,8 @@ Audk2g_STATUS audk2g_AudioDacSetOpMode(DacDevId devId,
1473 IFPRINT(audk2g_write("audk2g_AudioDacSetOpMode Called \n")); 1465 IFPRINT(audk2g_write("audk2g_AudioDacSetOpMode Called \n"));
1474 1466
1475 /* Check input parameters */ 1467 /* Check input parameters */
1476 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1468 if( !( (devId <= DAC_DEVICE_ALL) &&
1477 ((chanPair >= DAC_CHANP_1_2) && (chanPair <= DAC_CHANP_ALL)) && 1469 (chanPair <= DAC_CHANP_ALL) &&
1478 ((opMode == DAC_OPMODE_NORMAL) || 1470 ((opMode == DAC_OPMODE_NORMAL) ||
1479 (opMode == DAC_OPMODE_DISABLED)) ) ) 1471 (opMode == DAC_OPMODE_DISABLED)) ) )
1480 { 1472 {
@@ -1545,10 +1537,9 @@ Audk2g_STATUS audk2g_AudioDacSetFilterRolloff(DacDevId devId,
1545 IFPRINT(audk2g_write("audk2g_AudioDacSetFilterRolloff Called \n")); 1537 IFPRINT(audk2g_write("audk2g_AudioDacSetFilterRolloff Called \n"));
1546 1538
1547 /* Check input parameters */ 1539 /* Check input parameters */
1548 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1540 if( !( (devId <= DAC_DEVICE_ALL) &&
1549 ((chanPair >= DAC_CHANP_1_2) && (chanPair <= DAC_CHANP_ALL)) && 1541 (chanPair <= DAC_CHANP_ALL) &&
1550 ((rolloff >= DAC_FILTER_SHARP_ROLLOFF) && 1542 (rolloff <= DAC_FILTER_SLOW_ROLLOFF) ) )
1551 (rolloff <= DAC_FILTER_SLOW_ROLLOFF)) ) )
1552 { 1543 {
1553 IFPRINT(audk2g_write("audk2g_AudioDacSetFilterRolloff : Invalid Inputs\n")); 1544 IFPRINT(audk2g_write("audk2g_AudioDacSetFilterRolloff : Invalid Inputs\n"));
1554 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1545 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1610,10 +1601,9 @@ Audk2g_STATUS audk2g_AudioDacSetOutputPhase(DacDevId devId,
1610 IFPRINT(audk2g_write("audk2g_AudioDacSetOutputPhase Called \n")); 1601 IFPRINT(audk2g_write("audk2g_AudioDacSetOutputPhase Called \n"));
1611 1602
1612 /* Check input parameters */ 1603 /* Check input parameters */
1613 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1604 if( !( (devId <= DAC_DEVICE_ALL) &&
1614 ((chanId >= DAC_CHAN_1) && (chanId <= DAC_CHAN_ALL)) && 1605 (chanId <= DAC_CHAN_ALL) &&
1615 ((outPhase >= DAC_OUTPUT_PHASE_NORMAL) && 1606 (outPhase <= DAC_OUTPUT_PHASE_INVERTED) ) )
1616 (outPhase <= DAC_OUTPUT_PHASE_INVERTED)) ) )
1617 { 1607 {
1618 IFPRINT(audk2g_write("audk2g_AudioDacSetOutputPhase : Invalid Inputs\n")); 1608 IFPRINT(audk2g_write("audk2g_AudioDacSetOutputPhase : Invalid Inputs\n"));
1619 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1609 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1680,8 +1670,8 @@ Audk2g_STATUS audk2g_AudioDacSoftMuteCtrl(DacDevId devId,
1680 IFPRINT(audk2g_write("audk2g_AudioDacSoftMuteCtrl Called \n")); 1670 IFPRINT(audk2g_write("audk2g_AudioDacSoftMuteCtrl Called \n"));
1681 1671
1682 /* Check input parameters */ 1672 /* Check input parameters */
1683 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1673 if( !( (devId <= DAC_DEVICE_ALL) &&
1684 ((chanId >= DAC_CHAN_1) && (chanId <= DAC_CHAN_ALL)) && 1674 (chanId <= DAC_CHAN_ALL) &&
1685 ((muteEnable == 0) || (muteEnable == 1)) ) ) 1675 ((muteEnable == 0) || (muteEnable == 1)) ) )
1686 { 1676 {
1687 IFPRINT(audk2g_write("audk2g_AudioDacSoftMuteCtrl : Invalid Inputs\n")); 1677 IFPRINT(audk2g_write("audk2g_AudioDacSoftMuteCtrl : Invalid Inputs\n"));
@@ -1739,9 +1729,8 @@ Audk2g_STATUS audk2g_AudioDacSetAttnMode(DacDevId devId,
1739 IFPRINT(audk2g_write("audk2g_AudioDacSetAttnMode Called \n")); 1729 IFPRINT(audk2g_write("audk2g_AudioDacSetAttnMode Called \n"));
1740 1730
1741 /* Check input parameters */ 1731 /* Check input parameters */
1742 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1732 if( !( (devId <= DAC_DEVICE_ALL) &&
1743 ((attnMode >= DAC_ATTENUATION_FINE_STEP) && 1733 (attnMode <= DAC_ATTENUATION_WIDE_RANGE) ) )
1744 (attnMode <= DAC_ATTENUATION_WIDE_RANGE)) ) )
1745 { 1734 {
1746 IFPRINT(audk2g_write("audk2g_AudioDacSetAttnMode : Invalid Inputs\n")); 1735 IFPRINT(audk2g_write("audk2g_AudioDacSetAttnMode : Invalid Inputs\n"));
1747 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1736 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1788,9 +1777,8 @@ Audk2g_STATUS audk2g_AudioDacDeempCtrl(DacDevId devId,
1788 IFPRINT(audk2g_write("audk2g_AudioDacDeempCtrl Called \n")); 1777 IFPRINT(audk2g_write("audk2g_AudioDacDeempCtrl Called \n"));
1789 1778
1790 /* Check input parameters */ 1779 /* Check input parameters */
1791 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1780 if( !( (devId <= DAC_DEVICE_ALL) &&
1792 ((deempCtrl >= DAC_DEEMP_DISABLE) && 1781 (deempCtrl <= DAC_DEEMP_32KHZ) ) )
1793 (deempCtrl <= DAC_DEEMP_32KHZ)) ) )
1794 { 1782 {
1795 IFPRINT(audk2g_write("audk2g_AudioDacDeempCtrl : Invalid Inputs\n")); 1783 IFPRINT(audk2g_write("audk2g_AudioDacDeempCtrl : Invalid Inputs\n"));
1796 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1784 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
@@ -1850,8 +1838,8 @@ Audk2g_STATUS audk2g_AudioDacSetVolume(DacDevId devId,
1850 IFPRINT(audk2g_write("audk2g_AudioDacSetVolume Called \n")); 1838 IFPRINT(audk2g_write("audk2g_AudioDacSetVolume Called \n"));
1851 1839
1852 /* Check input parameters */ 1840 /* Check input parameters */
1853 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1841 if( !( (devId <= DAC_DEVICE_ALL) &&
1854 ((chanId >= DAC_CHAN_1) && (chanId <= DAC_CHAN_ALL)) && 1842 (chanId <= DAC_CHAN_ALL) &&
1855 (volume <= 100) ) ) 1843 (volume <= 100) ) )
1856 { 1844 {
1857 IFPRINT(audk2g_write("audk2g_AudioDacSetVolume : Invalid Inputs\n")); 1845 IFPRINT(audk2g_write("audk2g_AudioDacSetVolume : Invalid Inputs\n"));
@@ -1907,7 +1895,7 @@ Audk2g_STATUS audk2g_AudioDacSetPowerMode(DacDevId devId,
1907 IFPRINT(audk2g_write("audk2g_AudioDacSetPowerMode Called \n")); 1895 IFPRINT(audk2g_write("audk2g_AudioDacSetPowerMode Called \n"));
1908 1896
1909 /* Check input parameters */ 1897 /* Check input parameters */
1910 if( !( ((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL)) && 1898 if( !( (devId <= DAC_DEVICE_ALL) &&
1911 ((PowerMode == 0) || (PowerMode == 1)) ) ) 1899 ((PowerMode == 0) || (PowerMode == 1)) ) )
1912 { 1900 {
1913 IFPRINT(audk2g_write("audk2g_AudioDacSetPowerMode : Invalid Inputs\n")); 1901 IFPRINT(audk2g_write("audk2g_AudioDacSetPowerMode : Invalid Inputs\n"));
@@ -1953,7 +1941,7 @@ Audk2g_STATUS audk2g_AudioDacGetRegDump(DacDevId devId)
1953 1941
1954 IFPRINT(audk2g_write("audk2g_AudioDacGetRegDump Called \n")); 1942 IFPRINT(audk2g_write("audk2g_AudioDacGetRegDump Called \n"));
1955 1943
1956 if(!((devId >= DAC_DEVICE_0) && (devId <= DAC_DEVICE_ALL))) 1944 if(!(devId <= DAC_DEVICE_ALL))
1957 { 1945 {
1958 IFPRINT(audk2g_write("audk2g_AudioDacGetRegDump : Invalid Inputs\n")); 1946 IFPRINT(audk2g_write("audk2g_AudioDacGetRegDump : Invalid Inputs\n"));
1959 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT; 1947 audk2g_errno = AUDK2G_ERRNO_INVALID_ARGUMENT;
diff --git a/src/evmc66x_gpio.c b/src/evmc66x_gpio.c
index a391ddc..dd64c3f 100644
--- a/src/evmc66x_gpio.c
+++ b/src/evmc66x_gpio.c
@@ -83,7 +83,7 @@ static AUDK2G_GPIO_RET gpio_ctrl(uint8_t gpioPortNumber, uint8_t pinNum,
83 83
84 if(pinNum < AUDK2G_GPIO_MAX_NUMBER) 84 if(pinNum < AUDK2G_GPIO_MAX_NUMBER)
85 { 85 {
86 hGpio = gpioGetRegBaseAddr(gpioPortNumber); 86 hGpio = audk2g_gpioGetRegBaseAddr(gpioPortNumber);
87 if(hGpio != NULL) 87 if(hGpio != NULL)
88 { 88 {
89 bankIndex = pinNum / AUDK2G_GPIO_PINS_PER_BANK; 89 bankIndex = pinNum / AUDK2G_GPIO_PINS_PER_BANK;
@@ -170,7 +170,7 @@ static AUDK2G_GPIO_RET gpio_ctrl(uint8_t gpioPortNumber, uint8_t pinNum,
170 * \return CSL_GpioHandle\n 170 * \return CSL_GpioHandle\n
171 * 171 *
172 */ 172 */
173CSL_GpioHandle gpioGetRegBaseAddr(uint8_t gpioPortNumber) 173CSL_GpioHandle audk2g_gpioGetRegBaseAddr(uint8_t gpioPortNumber)
174{ 174{
175 CSL_GpioHandle addr; 175 CSL_GpioHandle addr;
176 176
@@ -191,7 +191,7 @@ CSL_GpioHandle gpioGetRegBaseAddr(uint8_t gpioPortNumber)
191 191
192 return (addr); 192 return (addr);
193 193
194} //gpioGetRegBaseAddr 194} //audk2g_gpioGetRegBaseAddr
195 195
196/** 196/**
197 * \brief Initializes the GPIO peripheral 197 * \brief Initializes the GPIO peripheral
@@ -203,7 +203,7 @@ CSL_GpioHandle gpioGetRegBaseAddr(uint8_t gpioPortNumber)
203 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 203 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
204 * 204 *
205 */ 205 */
206AUDK2G_GPIO_RET gpioInit(uint8_t gpioPortNumber) 206AUDK2G_GPIO_RET audk2g_gpioInit(uint8_t gpioPortNumber)
207{ 207{
208 AUDK2G_GPIO_RET retVal; 208 AUDK2G_GPIO_RET retVal;
209 uint8_t bankNum; 209 uint8_t bankNum;
@@ -216,14 +216,14 @@ AUDK2G_GPIO_RET gpioInit(uint8_t gpioPortNumber)
216 /* Disable the GPIO global interrupts */ 216 /* Disable the GPIO global interrupts */
217 for (bankNum = 0; bankNum < AUDK2G_GPIO_MAX_BANKS; bankNum++) 217 for (bankNum = 0; bankNum < AUDK2G_GPIO_MAX_BANKS; bankNum++)
218 { 218 {
219 gpioDisableGlobalInterrupt(gpioPortNumber, bankNum); 219 audk2g_gpioDisableGlobalInterrupt(gpioPortNumber, bankNum);
220 } 220 }
221 221
222 /* Clear all falling edge trigger and rising edge trigger */ 222 /* Clear all falling edge trigger and rising edge trigger */
223 for (pinNum = 0; pinNum < AUDK2G_GPIO_MAX_NUMBER; pinNum++) 223 for (pinNum = 0; pinNum < AUDK2G_GPIO_MAX_NUMBER; pinNum++)
224 { 224 {
225 gpioClearFallingEdgeInterrupt(gpioPortNumber, pinNum); 225 audk2g_gpioClearFallingEdgeInterrupt(gpioPortNumber, pinNum);
226 gpioClearRisingEdgeInterrupt(gpioPortNumber, pinNum); 226 audk2g_gpioClearRisingEdgeInterrupt(gpioPortNumber, pinNum);
227 } 227 }
228 } 228 }
229 else 229 else
@@ -233,7 +233,7 @@ AUDK2G_GPIO_RET gpioInit(uint8_t gpioPortNumber)
233 233
234 return (retVal); 234 return (retVal);
235 235
236} //gpioInit 236} //audk2g_gpioInit
237 237
238/** 238/**
239 * \brief This function configures the specified GPIO's direction 239 * \brief This function configures the specified GPIO's direction
@@ -348,7 +348,7 @@ uint32_t audk2g_gpioReadInput(uint8_t gpioPortNumber, uint8_t pinNum)
348 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 348 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
349 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number 349 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number
350 */ 350 */
351AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum) 351AUDK2G_GPIO_RET audk2g_gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum)
352{ 352{
353 AUDK2G_GPIO_RET retVal; 353 AUDK2G_GPIO_RET retVal;
354 CSL_GpioHandle hGpio; 354 CSL_GpioHandle hGpio;
@@ -357,7 +357,7 @@ AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNu
357 357
358 if(bankNum <= AUDK2G_GPIO_MAX_BANKS) 358 if(bankNum <= AUDK2G_GPIO_MAX_BANKS)
359 { 359 {
360 hGpio = gpioGetRegBaseAddr(gpioPortNumber); 360 hGpio = audk2g_gpioGetRegBaseAddr(gpioPortNumber);
361 if(hGpio != NULL) 361 if(hGpio != NULL)
362 { 362 {
363 CSL_GPIO_bankInterruptEnable(hGpio, bankNum); 363 CSL_GPIO_bankInterruptEnable(hGpio, bankNum);
@@ -374,7 +374,7 @@ AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNu
374 374
375 return (retVal); 375 return (retVal);
376 376
377} //gpioEnableGlobalInterrupt 377} //audk2g_gpioEnableGlobalInterrupt
378 378
379/** 379/**
380 * \brief This function Disables GPIO interrupts to CPU 380 * \brief This function Disables GPIO interrupts to CPU
@@ -387,7 +387,7 @@ AUDK2G_GPIO_RET gpioEnableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNu
387 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 387 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
388 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number 388 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO bank number
389 */ 389 */
390AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum) 390AUDK2G_GPIO_RET audk2g_gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankNum)
391{ 391{
392 AUDK2G_GPIO_RET retVal; 392 AUDK2G_GPIO_RET retVal;
393 CSL_GpioHandle hGpio; 393 CSL_GpioHandle hGpio;
@@ -396,7 +396,7 @@ AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankN
396 396
397 if(bankNum <= AUDK2G_GPIO_MAX_BANKS) 397 if(bankNum <= AUDK2G_GPIO_MAX_BANKS)
398 { 398 {
399 hGpio = gpioGetRegBaseAddr(gpioPortNumber); 399 hGpio = audk2g_gpioGetRegBaseAddr(gpioPortNumber);
400 if(hGpio != NULL) 400 if(hGpio != NULL)
401 { 401 {
402 CSL_GPIO_bankInterruptDisable(hGpio, bankNum); 402 CSL_GPIO_bankInterruptDisable(hGpio, bankNum);
@@ -413,7 +413,7 @@ AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankN
413 413
414 return (retVal); 414 return (retVal);
415 415
416} //gpioDisableGlobalInterrupt 416} //audk2g_gpioDisableGlobalInterrupt
417 417
418/** 418/**
419 * \brief This function sets specified GPIO's rising edge interrupt 419 * \brief This function sets specified GPIO's rising edge interrupt
@@ -426,7 +426,7 @@ AUDK2G_GPIO_RET gpioDisableGlobalInterrupt(uint8_t gpioPortNumber, uint8_t bankN
426 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 426 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
427 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 427 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
428 */ 428 */
429AUDK2G_GPIO_RET gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum) 429AUDK2G_GPIO_RET audk2g_gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum)
430{ 430{
431 AUDK2G_GPIO_RET retVal; 431 AUDK2G_GPIO_RET retVal;
432 432
@@ -434,7 +434,7 @@ AUDK2G_GPIO_RET gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNu
434 434
435 return (retVal); 435 return (retVal);
436 436
437} //gpioSetRisingEdgeInterrupt 437} //audk2g_gpioSetRisingEdgeInterrupt
438 438
439/** 439/**
440 * \brief This function clears specified GPIO's rising edge interrupt 440 * \brief This function clears specified GPIO's rising edge interrupt
@@ -447,7 +447,7 @@ AUDK2G_GPIO_RET gpioSetRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNu
447 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 447 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
448 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 448 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
449 */ 449 */
450AUDK2G_GPIO_RET gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum) 450AUDK2G_GPIO_RET audk2g_gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum)
451{ 451{
452 AUDK2G_GPIO_RET retVal; 452 AUDK2G_GPIO_RET retVal;
453 453
@@ -455,7 +455,7 @@ AUDK2G_GPIO_RET gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pin
455 455
456 return (retVal); 456 return (retVal);
457 457
458} //gpioClearRisingEdgeInterrupt 458} //audk2g_gpioClearRisingEdgeInterrupt
459 459
460/** 460/**
461 * \brief This function sets specified GPIO's falling edge interrupt 461 * \brief This function sets specified GPIO's falling edge interrupt
@@ -468,7 +468,7 @@ AUDK2G_GPIO_RET gpioClearRisingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pin
468 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 468 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
469 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 469 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
470 */ 470 */
471AUDK2G_GPIO_RET gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum) 471AUDK2G_GPIO_RET audk2g_gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum)
472{ 472{
473 AUDK2G_GPIO_RET retVal; 473 AUDK2G_GPIO_RET retVal;
474 474
@@ -476,7 +476,7 @@ AUDK2G_GPIO_RET gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinN
476 476
477 return (retVal); 477 return (retVal);
478 478
479} //gpioSetFallingEdgeInterrupt 479} //audk2g_gpioSetFallingEdgeInterrupt
480 480
481/** 481/**
482 * \brief This function clears specified GPIO's falling edge interrupt 482 * \brief This function clears specified GPIO's falling edge interrupt
@@ -489,7 +489,7 @@ AUDK2G_GPIO_RET gpioSetFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinN
489 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number 489 * \n INVALID_AUDK2G_GPIO_PORT - Invalid GPIO port number
490 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number 490 * \n INVALID_AUDK2G_GPIO_NUMBER - Invalid GPIO pin number
491 */ 491 */
492AUDK2G_GPIO_RET gpioClearFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum) 492AUDK2G_GPIO_RET audk2g_gpioClearFallingEdgeInterrupt(uint8_t gpioPortNumber, uint8_t pinNum)
493{ 493{
494 AUDK2G_GPIO_RET retVal; 494 AUDK2G_GPIO_RET retVal;
495 495
diff --git a/src/evmc66x_i2c.c b/src/evmc66x_i2c.c
index 0a33eec..c49914d 100644
--- a/src/evmc66x_i2c.c
+++ b/src/evmc66x_i2c.c
@@ -80,7 +80,7 @@ static I2C_RET i2c_check_bus_busy(CSL_I2cRegs *i2cReg)
80 80
81 if (pollingStatus) 81 if (pollingStatus)
82 { 82 {
83 i2cDelay (I2C_MASTER_TRANSMITTER_BUS_ACCESS_DELAY_US); 83 audk2g_i2cDelay (I2C_MASTER_TRANSMITTER_BUS_ACCESS_DELAY_US);
84 84
85 timeoutCounter += 1; 85 timeoutCounter += 1;
86 if (timeoutCounter >= I2C_MAX_MASTER_TRANSMITTER_BUS_ACCESS_TIMEOUT) 86 if (timeoutCounter >= I2C_MAX_MASTER_TRANSMITTER_BUS_ACCESS_TIMEOUT)
@@ -131,7 +131,7 @@ static I2C_RET i2c_send_stop(CSL_I2cRegs *i2cReg)
131 { 131 {
132 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTOP; 132 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTOP;
133 i2cReg->ICSTR = I2C_VAL_REG_STR_CLR_BUSY; 133 i2cReg->ICSTR = I2C_VAL_REG_STR_CLR_BUSY;
134 i2cDelay (DELAY_CONST); 134 audk2g_i2cDelay (DELAY_CONST);
135 timeoutCounter = 0; 135 timeoutCounter = 0;
136 } 136 }
137 else 137 else
@@ -144,7 +144,7 @@ static I2C_RET i2c_send_stop(CSL_I2cRegs *i2cReg)
144 /* On timeout put the peripheral into reset, wait, then 144 /* On timeout put the peripheral into reset, wait, then
145 * take it out of reset */ 145 * take it out of reset */
146 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET; 146 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET;
147 i2cDelay (DELAY_CONST); 147 audk2g_i2cDelay (DELAY_CONST);
148 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV; 148 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV;
149 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT; 149 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT;
150 150
@@ -153,7 +153,7 @@ static I2C_RET i2c_send_stop(CSL_I2cRegs *i2cReg)
153 return (I2C_RET_IDLE_TIMEOUT); 153 return (I2C_RET_IDLE_TIMEOUT);
154 } 154 }
155 155
156 i2cDelay (DELAY_CONST); 156 audk2g_i2cDelay (DELAY_CONST);
157 } 157 }
158 } while (timeoutCounter != 0); 158 } while (timeoutCounter != 0);
159 159
@@ -218,7 +218,7 @@ static I2C_RET i2c_transfer(CSL_I2cRegs *i2cReg, uint8_t *pData, uint8_t rdWrFla
218 else 218 else
219 { 219 {
220 /* Bus is not ready for transfer */ 220 /* Bus is not ready for transfer */
221 i2cDelay (DELAY_CONST); 221 audk2g_i2cDelay (DELAY_CONST);
222 timeoutCounter += 1; 222 timeoutCounter += 1;
223 223
224 if (timeoutCounter >= I2C_MAX_MASTER_TRANSFER_TIMEOUT) 224 if (timeoutCounter >= I2C_MAX_MASTER_TRANSFER_TIMEOUT)
@@ -241,7 +241,7 @@ static I2C_RET i2c_transfer(CSL_I2cRegs *i2cReg, uint8_t *pData, uint8_t rdWrFla
241 241
242/****************************************************************************** 242/******************************************************************************
243 * 243 *
244 * Function: i2cGetRegBaseAddr 244 * Function: audk2g_i2cGetRegBaseAddr
245 * 245 *
246 * Description: Returns base address of given I2C port number. 246 * Description: Returns base address of given I2C port number.
247 * 247 *
@@ -249,7 +249,7 @@ static I2C_RET i2c_transfer(CSL_I2cRegs *i2cReg, uint8_t *pData, uint8_t rdWrFla
249 ******************************************************************************/ 249 ******************************************************************************/
250 250
251#if 1 251#if 1
252CSL_I2cRegs* i2cGetRegBaseAddr(uint8_t i2cPortNumber) 252CSL_I2cRegs* audk2g_i2cGetRegBaseAddr(uint8_t i2cPortNumber)
253{ 253{
254 CSL_I2cRegs *addr; 254 CSL_I2cRegs *addr;
255 255
@@ -268,13 +268,13 @@ CSL_I2cRegs* i2cGetRegBaseAddr(uint8_t i2cPortNumber)
268 break; 268 break;
269 269
270 default : 270 default :
271 IFPRINT(audk2g_write("i2cGetRegBaseAddr: Invalid I2C Port Number\n")); 271 IFPRINT(audk2g_write("audk2g_i2cGetRegBaseAddr: Invalid I2C Port Number\n"));
272 addr = NULL; 272 addr = NULL;
273 break; 273 break;
274 } 274 }
275 275
276 return (addr); 276 return (addr);
277} //i2cGetRegBaseAddr 277} //audk2g_i2cGetRegBaseAddr
278#endif 278#endif
279 279
280/****************************************************************************** 280/******************************************************************************
@@ -311,7 +311,7 @@ I2C_RET i2cConfig(uint8_t i2cPortNumber)
311 311
312 if(i2cPortNumber < CSL_I2C_CNT) 312 if(i2cPortNumber < CSL_I2C_CNT)
313 { 313 {
314 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 314 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
315 } 315 }
316 else 316 else
317 { 317 {
@@ -322,7 +322,7 @@ I2C_RET i2cConfig(uint8_t i2cPortNumber)
322 // Set I2C in reset 322 // Set I2C in reset
323 i2cReg->ICMDR &= (~CSL_I2C_ICMDR_IRS_MASK); 323 i2cReg->ICMDR &= (~CSL_I2C_ICMDR_IRS_MASK);
324 324
325 i2cDelay(100); 325 audk2g_i2cDelay(100);
326 326
327 // Set Own Address 327 // Set Own Address
328 i2cReg->ICOAR = I2C_OWN_ADDR; 328 i2cReg->ICOAR = I2C_OWN_ADDR;
@@ -340,7 +340,7 @@ I2C_RET i2cConfig(uint8_t i2cPortNumber)
340 // Take I2C Out of Reset 340 // Take I2C Out of Reset
341 i2cReg->ICMDR |= CSL_I2C_ICMDR_IRS_MASK; 341 i2cReg->ICMDR |= CSL_I2C_ICMDR_IRS_MASK;
342 342
343 i2cDelay(100); 343 audk2g_i2cDelay(100);
344 344
345 return (I2C_RET_OK); 345 return (I2C_RET_OK);
346} //i2cConfig 346} //i2cConfig
@@ -383,7 +383,7 @@ I2C_RET audk2g_i2cWrite( uint8_t i2cPortNumber, uint8_t slaveAddress, uint8_t *p
383 383
384 if((i2cPortNumber < CSL_I2C_CNT) && (pData != NULL)) 384 if((i2cPortNumber < CSL_I2C_CNT) && (pData != NULL))
385 { 385 {
386 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 386 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
387 } 387 }
388 else 388 else
389 { 389 {
@@ -403,7 +403,7 @@ I2C_RET audk2g_i2cWrite( uint8_t i2cPortNumber, uint8_t slaveAddress, uint8_t *p
403 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMT; 403 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMT;
404 i2cReg->ICCNT = numBytes; 404 i2cReg->ICCNT = numBytes;
405 i2cReg->ICSAR = slaveAddress; 405 i2cReg->ICSAR = slaveAddress;
406 i2cDelay (DELAY_CONST); 406 audk2g_i2cDelay (DELAY_CONST);
407 407
408 /* Set the start bit */ 408 /* Set the start bit */
409 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTRT; 409 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTRT;
@@ -471,7 +471,7 @@ I2C_RET audk2g_i2cRead ( uint8_t i2cPortNumber, uint8_t slaveAddress, uint8_t *p
471 471
472 if(i2cPortNumber < CSL_I2C_CNT) 472 if(i2cPortNumber < CSL_I2C_CNT)
473 { 473 {
474 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 474 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
475 } 475 }
476 else 476 else
477 { 477 {
@@ -501,7 +501,7 @@ I2C_RET audk2g_i2cRead ( uint8_t i2cPortNumber, uint8_t slaveAddress, uint8_t *p
501 } 501 }
502 502
503 /* Give the I2C prom 10ms to process the read command */ 503 /* Give the I2C prom 10ms to process the read command */
504 i2cDelay (DELAY_CONST); 504 audk2g_i2cDelay (DELAY_CONST);
505 505
506 /* Set the start bit, begin the master read */ 506 /* Set the start bit, begin the master read */
507 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTRCV; 507 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTRCV;
@@ -536,7 +536,7 @@ I2C_RET audk2g_i2cRead ( uint8_t i2cPortNumber, uint8_t slaveAddress, uint8_t *p
536 } 536 }
537 else 537 else
538 { /* rrdy not set */ 538 { /* rrdy not set */
539 i2cDelay (DELAY_CONST); 539 audk2g_i2cDelay (DELAY_CONST);
540 timeoutCounter += 1; 540 timeoutCounter += 1;
541 541
542 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT) 542 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT)
@@ -610,7 +610,7 @@ I2C_RET audk2g_i2cWriteLong( uint8_t i2cPortNumber, uint8_t slaveAddress,
610 610
611 if((i2cPortNumber < CSL_I2C_CNT) && (pData != NULL)) 611 if((i2cPortNumber < CSL_I2C_CNT) && (pData != NULL))
612 { 612 {
613 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 613 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
614 } 614 }
615 else 615 else
616 { 616 {
@@ -637,7 +637,7 @@ I2C_RET audk2g_i2cWriteLong( uint8_t i2cPortNumber, uint8_t slaveAddress,
637 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMT; 637 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMT;
638 i2cReg->ICSAR = slaveAddress; 638 i2cReg->ICSAR = slaveAddress;
639 i2cReg->ICCNT = numBytes + OffsetLen; 639 i2cReg->ICCNT = numBytes + OffsetLen;
640 i2cDelay (DELAY_CONST); 640 audk2g_i2cDelay (DELAY_CONST);
641 641
642 /* Set the start bit */ 642 /* Set the start bit */
643 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTRT; 643 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTRT;
@@ -694,7 +694,7 @@ void audk2g_delaycycles(uint32_t cycles)
694 694
695/****************************************************************************** 695/******************************************************************************
696 * 696 *
697 * Function: i2cDelay 697 * Function: audk2g_i2cDelay
698 * 698 *
699 * Description: Creates a delay. 699 * Description: Creates a delay.
700 * 700 *
@@ -703,7 +703,7 @@ void audk2g_delaycycles(uint32_t cycles)
703 * Return Value: void 703 * Return Value: void
704 * 704 *
705 ******************************************************************************/ 705 ******************************************************************************/
706void i2cDelay (uint32_t count) 706void audk2g_i2cDelay (uint32_t count)
707{ 707{
708 uint32_t i; 708 uint32_t i;
709 709
@@ -711,7 +711,7 @@ void i2cDelay (uint32_t count)
711 { 711 {
712 audk2g_delaycycles(50000); 712 audk2g_delaycycles(50000);
713 } 713 }
714} //i2cDelay 714} //audk2g_i2cDelay
715 715
716/****************************************************************************** 716/******************************************************************************
717 * 717 *
@@ -733,7 +733,7 @@ static I2C_RET i2c_force_release_bus(uint8_t i2cPortNumber)
733 733
734 if(i2cPortNumber < CSL_I2C_CNT) 734 if(i2cPortNumber < CSL_I2C_CNT)
735 { 735 {
736 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 736 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
737 } 737 }
738 else 738 else
739 { 739 {
@@ -752,17 +752,17 @@ static I2C_RET i2c_force_release_bus(uint8_t i2cPortNumber)
752 { 752 {
753 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTOP; 753 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTXMTSTOP;
754 i2cReg->ICSTR = I2C_VAL_REG_STR_CLR_BUSY; 754 i2cReg->ICSTR = I2C_VAL_REG_STR_CLR_BUSY;
755 i2cDelay (DELAY_CONST); 755 audk2g_i2cDelay (DELAY_CONST);
756 756
757 if(I2C_REG_STR_FIELD_BB(i2cReg->ICSTR)) 757 if(I2C_REG_STR_FIELD_BB(i2cReg->ICSTR))
758 { 758 {
759 /* Some grave issue -- Issue reset*/ 759 /* Some grave issue -- Issue reset*/
760 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET; 760 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET;
761 i2cDelay (0x100); 761 audk2g_i2cDelay (0x100);
762 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV; 762 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV;
763 } 763 }
764 764
765 i2cDelay (DELAY_CONST); 765 audk2g_i2cDelay (DELAY_CONST);
766 timeoutCounter = 0; 766 timeoutCounter = 0;
767 } 767 }
768 else 768 else
@@ -774,7 +774,7 @@ static I2C_RET i2c_force_release_bus(uint8_t i2cPortNumber)
774 /* On timeout put the peripheral into reset, wait, then 774 /* On timeout put the peripheral into reset, wait, then
775 * take it out of reset */ 775 * take it out of reset */
776 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET; 776 i2cReg->ICMDR = I2C_VAL_REG_MDR_RESET;
777 i2cDelay (0x100); 777 audk2g_i2cDelay (0x100);
778 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV; 778 i2cReg->ICMDR = I2C_VAL_REG_MDR_SLVRCV;
779 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT; 779 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT;
780 780
@@ -783,7 +783,7 @@ static I2C_RET i2c_force_release_bus(uint8_t i2cPortNumber)
783 return (I2C_RET_IDLE_TIMEOUT); 783 return (I2C_RET_IDLE_TIMEOUT);
784 } 784 }
785 785
786 i2cDelay (DELAY_CONST); 786 audk2g_i2cDelay (DELAY_CONST);
787 } 787 }
788 } while (timeoutCounter != 0); 788 } while (timeoutCounter != 0);
789 789
@@ -824,7 +824,7 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
824 824
825 if(i2cPortNumber < CSL_I2C_CNT) 825 if(i2cPortNumber < CSL_I2C_CNT)
826 { 826 {
827 i2cReg = i2cGetRegBaseAddr(i2cPortNumber); 827 i2cReg = audk2g_i2cGetRegBaseAddr(i2cPortNumber);
828 } 828 }
829 else 829 else
830 { 830 {
@@ -849,8 +849,8 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
849 } 849 }
850 850
851 /* Give the I2C prom 10ms to process the read command */ 851 /* Give the I2C prom 10ms to process the read command */
852 i2cDelay (DELAY_CONST); 852 audk2g_i2cDelay (DELAY_CONST);
853 i2cDelay (DELAY_CONST); 853 audk2g_i2cDelay (DELAY_CONST);
854 854
855 /* Set the start bit, begin the master read */ 855 /* Set the start bit, begin the master read */
856 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTRCV; 856 i2cReg->ICMDR = I2C_VAL_REG_MDR_MSTRCV;
@@ -873,9 +873,9 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
873 audk2g_errno2 = AUDK2G_ERRNO_DEV_NAK; 873 audk2g_errno2 = AUDK2G_ERRNO_DEV_NAK;
874 874
875 IFPRINT(audk2g_write("i2cProbe: I2C NAK Error\n")); 875 IFPRINT(audk2g_write("i2cProbe: I2C NAK Error\n"));
876 i2cDelay(CUSTOM_DELAY); 876 audk2g_i2cDelay(CUSTOM_DELAY);
877 i2c_force_release_bus(i2cPortNumber); 877 i2c_force_release_bus(i2cPortNumber);
878 i2cDelay(CUSTOM_DELAY); 878 audk2g_i2cDelay(CUSTOM_DELAY);
879 return (I2C_RET_NO_ACK_READ); 879 return (I2C_RET_NO_ACK_READ);
880 } 880 }
881 881
@@ -889,7 +889,7 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
889 } 889 }
890 else 890 else
891 { /* RRDY bit not set */ 891 { /* RRDY bit not set */
892 i2cDelay (DELAY_CONST); 892 audk2g_i2cDelay (DELAY_CONST);
893 timeoutCounter += 1; 893 timeoutCounter += 1;
894 894
895 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT) 895 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT)
@@ -900,9 +900,9 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
900 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT; 900 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT;
901 901
902 IFPRINT(audk2g_write("i2cProbe: I2C Device Timeout\n")); 902 IFPRINT(audk2g_write("i2cProbe: I2C Device Timeout\n"));
903 i2cDelay(CUSTOM_DELAY); 903 audk2g_i2cDelay(CUSTOM_DELAY);
904 i2c_force_release_bus(i2cPortNumber); 904 i2c_force_release_bus(i2cPortNumber);
905 i2cDelay(CUSTOM_DELAY); 905 audk2g_i2cDelay(CUSTOM_DELAY);
906 return (I2C_RET_IDLE_TIMEOUT); 906 return (I2C_RET_IDLE_TIMEOUT);
907 } 907 }
908 } 908 }
@@ -927,7 +927,7 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
927 } 927 }
928 else 928 else
929 { /* rrdy not set */ 929 { /* rrdy not set */
930 i2cDelay (DELAY_CONST); 930 audk2g_i2cDelay (DELAY_CONST);
931 timeoutCounter += 1; 931 timeoutCounter += 1;
932 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT) 932 if (timeoutCounter >= I2C_MAX_MASTER_RECEIVE_TIMEOUT)
933 { 933 {
@@ -937,9 +937,9 @@ I2C_RET i2cProbe (uint8_t i2cPortNumber, uint8_t slaveAddress,
937 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT; 937 audk2g_errno2 = AUDK2G_ERRNO_DEV_TIMEOUT;
938 938
939 IFPRINT(audk2g_write("i2cProbe: I2C Device Timeout - RRDY not set\n")); 939 IFPRINT(audk2g_write("i2cProbe: I2C Device Timeout - RRDY not set\n"));
940 i2cDelay(CUSTOM_DELAY); 940 audk2g_i2cDelay(CUSTOM_DELAY);
941 i2c_force_release_bus(i2cPortNumber); 941 i2c_force_release_bus(i2cPortNumber);
942 i2cDelay(CUSTOM_DELAY); 942 audk2g_i2cDelay(CUSTOM_DELAY);
943 return (I2C_RET_IDLE_TIMEOUT); 943 return (I2C_RET_IDLE_TIMEOUT);
944 } 944 }
945 } 945 }
diff --git a/src/evmc66x_pinmux.c b/src/evmc66x_pinmux.c
index 141e115..e92836f 100644
--- a/src/evmc66x_pinmux.c
+++ b/src/evmc66x_pinmux.c
@@ -41,6 +41,7 @@
41 41
42#include "../include/audk2g.h" 42#include "../include/audk2g.h"
43 43
44#if 0
44static uint32_t gPinMuxDefault[PADCONFIG_MAX_COUNT] = 45static uint32_t gPinMuxDefault[PADCONFIG_MAX_COUNT] =
45{ 46{
46 PADCONFIG_MUX_MODE_PRIMARY, // PADCONFIG0 default mux mode - GPMCAD0 47 PADCONFIG_MUX_MODE_PRIMARY, // PADCONFIG0 default mux mode - GPMCAD0
@@ -305,6 +306,7 @@ static uint32_t gPinMuxDefault[PADCONFIG_MAX_COUNT] =
305 PADCONFIG_MUX_MODE_PRIMARY, // PADCONFIG258 default mux mode 306 PADCONFIG_MUX_MODE_PRIMARY, // PADCONFIG258 default mux mode
306 PADCONFIG_MUX_MODE_PRIMARY // PADCONFIG259 default mux mode 307 PADCONFIG_MUX_MODE_PRIMARY // PADCONFIG259 default mux mode
307}; 308};
309#endif
308 310
309/** 311/**
310 * \brief Configures default mode for pin muxing in pad config registers 312 * \brief Configures default mode for pin muxing in pad config registers
@@ -338,8 +340,7 @@ int32_t audk2g_pinMuxSetMode(uint16_t padCfgId, PadCfgMuxMode muxMode)
338 volatile Uint32 *padCfgBase; 340 volatile Uint32 *padCfgBase;
339 341
340 if((padCfgId < PADCONFIG_MAX_COUNT) && 342 if((padCfgId < PADCONFIG_MAX_COUNT) &&
341 ((muxMode >= PADCONFIG_MUX_MODE_PRIMARY) && 343 (muxMode <= PADCONFIG_MUX_MODE_SENARY))
342 (muxMode <= PADCONFIG_MUX_MODE_SENARY)))
343 { 344 {
344 /* Unlock the Boot Config */ 345 /* Unlock the Boot Config */
345 CSL_BootCfgUnlockKicker(); 346 CSL_BootCfgUnlockKicker();