Merge pull request ARMmbed#8014 from M-ichae-l/realtek-rtl8195am-lib-updates

realtek rtl8195am lib updates

Author: 0xc0170

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogin_api.c

@@ -41,8 +41,11 @@ void analogin_init (analogin_t *obj, PinName pin)
     HAL_ADC_INIT_DAT        HalADCInitDataTmp;
     PHAL_ADC_INIT_DAT       pHalADCInitDataTmp = &HalADCInitDataTmp;
     /* To backup user config first */
-    
+
+#if defined(CONFIG_MBED_ENABLED)
     _memset(&(obj->HalADCInitData), 0, sizeof(HAL_ADC_INIT_DAT));
+#endif
+
     _memcpy(pHalADCInitDataTmp, &(obj->HalADCInitData), sizeof(HAL_ADC_INIT_DAT));
     _memset(obj, 0x00, sizeof(analogin_t));
 
@@ -92,17 +95,13 @@ void analogin_init (analogin_t *obj, PinName pin)
     pSalADCHND->pUserCB     = pSalADCMngtAdpt->pUserCB;
 
     /*To assign user callback pointers*/
-    pSalADCMngtAdpt->pUserCB->pTXCB     = pSalADCUserCBAdpt;
-    pSalADCMngtAdpt->pUserCB->pTXCCB    = (pSalADCUserCBAdpt+1);
-    pSalADCMngtAdpt->pUserCB->pRXCB     = (pSalADCUserCBAdpt+2);
-    pSalADCMngtAdpt->pUserCB->pRXCCB    = (pSalADCUserCBAdpt+3);
-    pSalADCMngtAdpt->pUserCB->pRDREQCB  = (pSalADCUserCBAdpt+4);
-    pSalADCMngtAdpt->pUserCB->pERRCB    = (pSalADCUserCBAdpt+5);
-    pSalADCMngtAdpt->pUserCB->pDMATXCB  = (pSalADCUserCBAdpt+6);
-    pSalADCMngtAdpt->pUserCB->pDMATXCCB = (pSalADCUserCBAdpt+7);
-    pSalADCMngtAdpt->pUserCB->pDMARXCB  = (pSalADCUserCBAdpt+8);
-    pSalADCMngtAdpt->pUserCB->pDMARXCCB = (pSalADCUserCBAdpt+9);
-        
+
+    pSalADCMngtAdpt->pUserCB->pRXCB     = pSalADCUserCBAdpt;
+    pSalADCMngtAdpt->pUserCB->pRXCCB    = (pSalADCUserCBAdpt+1);
+    pSalADCMngtAdpt->pUserCB->pERRCB    = (pSalADCUserCBAdpt+2);
+    pSalADCMngtAdpt->pUserCB->pIDMARXCCB= (pSalADCUserCBAdpt+3);
+    pSalADCMngtAdpt->pUserCB->pDMARXCB  = (pSalADCUserCBAdpt+4);
+    pSalADCMngtAdpt->pUserCB->pDMARXCCB = (pSalADCUserCBAdpt+5);
     /* Set ADC Device Number */
     pSalADCHND->DevNum = adc_idx;
 
@@ -136,9 +135,13 @@ float analogin_read(analogin_t *obj)
     uint8_t  AnaloginIdx         = 0;
     uint32_t AnalogDat           = 0;
 
+#if defined(CONFIG_MBED_ENABLED)
     //no auto-calibration implemented yet, uses hard coded calibrate
     uint32_t Offset        = 0x2980;
     uint32_t AnalogDatFull = 0xAA00;
+#else
+    uint32_t AnalogDatFull = 0;
+#endif
 
     PSAL_ADC_MNGT_ADPT      pSalADCMngtAdpt     = NULL;
     PSAL_ADC_HND            pSalADCHND          = NULL;
@@ -152,7 +155,12 @@ float analogin_read(analogin_t *obj)
     AnalogDat = AnaloginTmp[(AnaloginIdx/2)];
     AnalogDat = (AnalogDat & AnaloginDatMsk);    
     AnalogDat = (AnalogDat>>((u32)(16*(AnaloginIdx&0x01))));
+
+#if defined(CONFIG_MBED_ENABLED)
     AnalogDat -= Offset;
+#else
+    AnalogDatFull   = 0xCE80;
+#endif
 
     value = (float)(AnalogDat) / (float)(AnalogDatFull);
     return (float)value;

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/analogout_api.c

@@ -26,6 +26,8 @@
 #define DAC_POSITIVE_FULL_SCALE  0x7E0
 #define DAC_NEGATIVE_FULL_SCALE  0x820
 
+extern void HalDACPinMuxInit(void *Data);
+extern void HalDACPinMuxDeInit(void *Data);
 
 /** \brief analogout_init:\n
  *          to initialize DAC

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/TOOLCHAIN_ARM_STD/lib_peripheral_mbed_arm.ar

@@ -18,9 +18,7 @@
 /*
  * Target Platform Selection
  */
-#define CONFIG_WITHOUT_MONITOR 1
-
-#undef  CONFIG_RTL8195A 
+#undef  CONFIG_RTL8195A
 #define CONFIG_RTL8195A 1
 #undef  CONFIG_FPGA
 #undef  CONFIG_RTL_SIM
@@ -54,12 +52,21 @@
 #undef  CONFIG_IMAGE_AUTO_LOAD
 //#undef  CONFIG_IMAGE_PAGE_LOAD
 //#define CONFIG_IMAGE_AUTO_LOAD 1
-#define CONFIG_BOOT_TO_UPGRADE_IMG2 1
+
+#undef  CONFIG_BOOT_TO_UPGRADE_IMG2
+
 #undef  CONFIG_PERI_UPDATE_IMG
 #define CONFIG_BOOT_FROM_JTAG 1
 #undef  CONFIG_ALIGNMENT_EXCEPTION_ENABLE
 #define CONFIG_KERNEL 1
+
 #define PLATFORM_FREERTOS	1
+#define  CONFIG_MBED_ENABLED 1
+#if defined(CONFIG_MBED_ENABLED)
+#undef PLATFORM_FREERTOS
+#define PLATFORM_CMSIS_RTOS 	1
+#endif
+
 #undef  PLATFORM_UCOSII
 #undef  PLATFORM_ECOS
 #undef  CONFIG_TASK_SCHEDUL_DIS
@@ -73,7 +80,11 @@
 #define CONFIG_WDG 1
 #undef  CONFIG_WDG_NON
 #define CONFIG_WDG_NORMAL 1
-#define CONFIG_GDMA_EN 0
+
+#undef  CONFIG_WDG_TEST
+#define CONFIG_WDG_MODULE 1
+#define CONFIG_GDMA_EN 1
+
 #define CONFIG_GDMA_NORMAL 1
 #undef  CONFIG_GDMA_TEST
 #define CONFIG_GDMA_MODULE 1
@@ -85,6 +96,7 @@
 #define CONFIG_GPIO_NORMAL 1
 #undef  CONFIG_GPIO_TEST
 #define CONFIG_GPIO_MODULE 1
+
 #if defined(CONFIG_INIC) || (CONFIG_SDIOD)
 #define CONFIG_SDIO_DEVICE_EN 1
 #define CONFIG_SDIO_DEVICE_NORMAL 1
@@ -107,6 +119,10 @@
 #define  DWC_HOST_ONLY 1
 #define CONFIG_USB_HOST_ONLY 1
 #endif
+
+#undef CONFIG_SDIO_HOST_EN
+#undef CONFIG_USB_EN
+
 #define CONFIG_SPI_COM_EN 1
 #define CONFIG_SPI_COM_NORMAL 1
 #undef  CONFIG_SPI_COM_TEST
@@ -121,24 +137,31 @@
 #define CONFIG_I2C_MODULE 1
 #undef  CONFIG_DEBUG_LOG_I2C_HAL
 #undef  CONFIG_PCM_EN
-#undef CONFIG_I2S_EN
-#undef CONFIG_I2S_NORMAL
+#define CONFIG_I2S_EN 1
+#define CONFIG_I2S_NORMAL 1
 #undef  CONFIG_I2S_TEST
-#undef CONFIG_I2S_MODULE
+#define CONFIG_I2S_MODULE 1
+
 #undef  CONFIG_DEBUG_LOG_I2S_HAL
 #undef CONFIG_NFC_EN
 #undef CONFIG_NFC_NORMAL
 #undef  CONFIG_NFC_TEST 
 #undef CONFIG_NFC_MODULE
+
+// power saving enable
 #define CONFIG_SOC_PS_EN 1
 #define CONFIG_SOC_PS_NORMAL 1
 #undef  CONFIG_SOC_PS_TEST
-//#define CONFIG_SOC_PS_MODULE 1
+#define CONFIG_SOC_PS_MODULE 1
+
 #define CONFIG_CRYPTO_EN 1
 #define CONFIG_CRYPTO_NORMAL 1
 #undef  CONFIG_CRYPTO_TEST
 #define CONFIG_CRYPTO_MODULE 1
-#define CONFIG_MII_EN	1
+
+//#define CONFIG_MII_EN	1
+#undef CONFIG_MII_EN
+
 #define CONFIG_PWM_EN 1
 #define CONFIG_PWM_NORMAL 1
 #undef  CONFIG_PWM_TEST
@@ -186,19 +209,13 @@
 #define CONFIG_UART_LOG_HISTORY 1
 #undef  CONFIG_CONSOLE_NORMALL_MODE
 #define CONFIG_CONSOLE_VERIFY_MODE 1
-#undef  CONFIG_DEBUG_LOG
+
+//#undef  CONFIG_DEBUG_LOG
+#define  CONFIG_DEBUG_LOG 1
+
 #define CONFIG_DEBUG_ERR_MSG 1
 #undef  CONFIG_DEBUG_WARN_MSG
 #undef  CONFIG_DEBUG_INFO_MSG
-
-/*
- * < SDK Option Config 
- */
-//#undef  CONFIG_MBED_ENABLED
-#ifdef CONFIG_MBED_ENABLED
-#undef PLATFORM_FREERTOS
-#define PLATFORM_CMSIS_RTOS 	1
-#endif
 #undef  CONFIG_APP_DEMO
 
 /*