Fold ADC0 into trng; delete comment code

Archcady · Archcady · commit 4cbbb9ab988d · 2017-04-17T11:06:46.000+08:00
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.cpp b/targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.cpp
@@ -166,13 +166,11 @@ nsapi_error_t RTWInterface::connect()
         wifi_set_pscan_chan(&_channel, &pscan_config, 1);
     }
     
-    //printf("Connecting to: %s ... \r\n", _ssid);
     ret = wifi_connect(_ssid, sec, _pass, strlen(_ssid), strlen(_pass), 0, (void *)NULL);
     if (ret != RTW_SUCCESS) {
         printf("failed: %d\r\n", ret);
         return NSAPI_ERROR_NO_CONNECTION;
     }
-    //printf("connected\r\n");
 
     wlan_emac_link_change(true);
     return mbed_lwip_bringup(_dhcp,
@@ -232,13 +230,11 @@ nsapi_error_t RTWInterface::disconnect()
     wlan_emac_link_change(false);
     if(wifi_is_connected_to_ap() != RTW_SUCCESS)
         return NSAPI_ERROR_NO_CONNECTION;
-    //printf("Deassociating AP ...\r\n");
     if(wifi_disconnect()<0){		
         return NSAPI_ERROR_DEVICE_ERROR;
     }
     while(1){
         if(wext_get_ssid(WLAN0_NAME, (unsigned char *) essid) < 0) {
-            //printf("WIFI disconnected\n\r");
             break;
         }
     }
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/objects.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/objects.h
@@ -198,9 +198,14 @@ struct dac_s {
 };
 #endif
 
+#ifdef CONFIG_ADC_EN //True random number generator uses ADC
+
 struct trng_s{
 	uint32_t pin;
+	struct analogin_s tradcng;
+	uint8_t inited;
 };
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/analogin_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/analogin_api.c
@@ -135,7 +135,7 @@ float analogin_read(analogin_t *obj){
     uint32_t AnaloginDatMsk      = 0xFFFF;
     uint8_t  AnaloginIdx         = 0;
     uint32_t AnalogDat           = 0;
-    uint32_t Offset = 0x2980;//0x2C00;
+    uint32_t Offset = 0x2980;
     uint32_t AnalogDatFull = 0xAA00;
 
     PSAL_ADC_MNGT_ADPT      pSalADCMngtAdpt     = NULL;
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp b/targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp
@@ -106,15 +106,13 @@ static bool wlan_link_out(emac_interface_t *emac, emac_stack_mem_t *buf)
 
 static bool wlan_power_up(emac_interface_t *emac)
 {
-    //printf("Powering up WiFi ...\r\n");
     wifi_on(RTW_MODE_STA);
     wait_ms(1000);
     return true;
 }
 
 static void wlan_power_down(emac_interface_t *emac)
 {
-    //printf("Powering down WiFi ...\r\n");
     wifi_off();
 }
 
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_ssi.h b/targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_ssi.h
@@ -21,7 +21,6 @@
  */
 
 extern u32 SSI_DBG_CONFIG;
-extern uint8_t SPI0_IS_AS_SLAVE;
 
 
 #define SSI_DBG_ENTRANCE(...)  do {\
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/serial_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/serial_api.c
@@ -196,13 +196,10 @@ void serial_baud(serial_t *obj, int baudrate) {
 	}
 #endif
     PHAL_RUART_ADAPTER pHalRuartAdapter;
-    //PHAL_RUART_OP      pHalRuartOp;
 
     pHalRuartAdapter = &(obj->hal_uart_adp);
-    //pHalRuartOp = &(obj->hal_uart_op);
 
     pHalRuartAdapter->BaudRate = baudrate;
-//  HalRuartInit(pHalRuartAdapter);
     HalRuartSetBaudRate((VOID*)pHalRuartAdapter);
 }
 
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/spi_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/spi_api.c
@@ -36,7 +36,6 @@ void spi_bus_tx_done_callback(VOID *obj);
 HAL_GDMA_OP SpiGdmaOp;
 #endif
 
-uint8_t SPI0_IS_AS_SLAVE = 0;
 
 //TODO: Load default Setting: It should be loaded from external setting file.
 extern const DW_SSI_DEFAULT_SETTING SpiDefaultSetting;
@@ -221,7 +220,6 @@ void spi_format (spi_t *obj, int bits, int mode, int slave)
         if (pHalSsiAdaptor->Index == 0) {
             pHalSsiAdaptor->Role = SSI_SLAVE;
             pHalSsiAdaptor->SlaveOutputEnable = SLV_TXD_ENABLE;  // <-- Slave only
-            SPI0_IS_AS_SLAVE = 1;
             DBG_SSI_INFO("SPI0 is as slave\n");
         }
         else {
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/trng_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/trng_api.c
@@ -18,37 +18,38 @@
 #include "analogin_ext.h"
 
 #ifdef DEVICE_TRNG
-static analogin_t tradcng;
-static uint8_t trng_inited;
+
 
 void trng_init(trng_t *obj)
 {
-    if (trng_inited != 0) {
-        return;
-    }
-    analogin_init(&tradcng, ADC0);
-    trng_inited = 1;
+	_memset((void *)obj, 0, sizeof(trng_t));
+    analogin_init(&obj->tradcng, ADC0);
+    obj->inited = 1;
 }
 
 void trng_free(trng_t *obj)
 {
-    trng_inited = 0;
-    analogin_deinit(&tradcng);
+    if (!obj->inited) {
+        return;
+    }
+	
+    obj->inited = 0;
+    analogin_deinit(&obj->tradcng);
 }
 
-static void trng_get_byte(unsigned char *byte)
+static void trng_get_byte(trng_t *obj, unsigned char *byte)
 {
     size_t bit;
     uint32_t adc[2];
 	
     PSAL_ADC_MNGT_ADPT      pSalADCMngtAdpt     = NULL;
     PSAL_ADC_HND            pSalADCHND          = NULL;
 
-    pSalADCMngtAdpt         = &(tradcng.SalADCMngtAdpt);
+    pSalADCMngtAdpt         = &(obj->tradcng.SalADCMngtAdpt);
     pSalADCHND              = &(pSalADCMngtAdpt->pSalHndPriv->SalADCHndPriv);
 
     *byte = 0;
-    for (bit=0; bit<8; bit++) {
+    for (bit = 0; bit < 8; bit++) {
 		RtkADCRxManualRotate(pSalADCHND, adc);
         *byte |= (adc[0] & 0x01) << bit;
     }
@@ -57,9 +58,13 @@ static void trng_get_byte(unsigned char *byte)
 int trng_get_bytes(trng_t *obj, uint8_t *buf, size_t len, size_t *output_len)
 {
     size_t i;
+	
+    if (!obj->inited) {
+        return -1;
+    }
 
     for (i = 0; i < len; i++) {
-        trng_get_byte(buf + i);
+        trng_get_byte(obj, buf + i);
     }
 
     *output_len = len;
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/us_ticker.c b/targets/TARGET_Realtek/TARGET_AMEBA/us_ticker.c
@@ -31,7 +31,6 @@ extern HAL_TIMER_OP_EXT HalTimerOpExt;
 
 VOID _us_ticker_irq_handler(IN  VOID *Data)
 {
-	//printf("_us_ticker_irq_handler\r\n");
     us_ticker_irq_handler();
 }
 
@@ -41,7 +40,6 @@ void us_ticker_init(void)
     if (us_ticker_inited) return;
     us_ticker_inited = 1;
 	
-	//printf("us_ticker_init\r\n");
 
     // Initial a G-Timer
     TimerAdapter.IrqDis = 0;    // Enable Irq @ initial
@@ -59,7 +57,6 @@ void us_ticker_init(void)
     DBG_TIMER_INFO("%s: Timer_Id=%d\n", __FUNCTION__, APP_TIM_ID);
 }
 
-#if (!TICK_READ_FROM_CPU) || !defined(PLATFORM_FREERTOS)
 uint32_t us_ticker_read() 
 {
     uint32_t tick_cnt;
@@ -76,38 +73,6 @@ uint32_t us_ticker_read()
 
     return ((uint32_t)us_tick);
 }
-#else
-// if the system tick didn't be initialed, call delay function may got system hang
-#define OS_CLOCK        (200000000UL/6*5)       // CPU clock = 166.66 MHz
-#define OS_TICK         1000                    // OS ticks 1000/sec
-#define OS_TRV          ((uint32_t)(((double)OS_CLOCK*(double)OS_TICK)/1E6)-1)
-#define NVIC_ST_CTRL    (*((volatile uint32_t *)0xE000E010))
-#define NVIC_ST_RELOAD  (*((volatile uint32_t *)0xE000E014))
-#define NVIC_ST_CURRENT (*((volatile uint32_t *)0xE000E018))
-
-extern uint32_t xTaskGetTickCount( void );
-
-uint32_t us_ticker_read() 
-{
-    uint32_t tick_cnt;
-    uint32_t us_tick, ms;
-    static uint32_t last_us_tick=0;
-    
-    ms = xTaskGetTickCount();
-    us_tick = (uint32_t)(ms*1000);
-
-    tick_cnt = OS_TRV - NVIC_ST_CURRENT;
-    us_tick += (uint32_t)((tick_cnt*1000)/(OS_TRV+1) );
-        
-    if ( (last_us_tick > us_tick) && (last_us_tick < 0xFFFFFC00) ) {
-        us_tick += 1000;
-    }
-    last_us_tick = us_tick;
-    return us_tick;
-        
-}
-
-#endif
 
 void us_ticker_set_interrupt(timestamp_t timestamp) 
 {
@@ -130,7 +95,6 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
 	HalTimerOpExt.HalTimerReLoad((u32)TimerAdapter.TimerId, time_def);
 	HalTimerOpExt.HalTimerIrqEn((u32)TimerAdapter.TimerId);
 	HalTimerOp.HalTimerEn((u32)TimerAdapter.TimerId);
-	//printf("us_ticker_set_interrupt %d\r\n",timestamp);
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -166,13 +166,11 @@ nsapi_error_t RTWInterface::connect()`
`166`	`166`	`wifi_set_pscan_chan(&_channel, &pscan_config, 1);`
`167`	`167`	`}`
`168`	`168`
`169`		`- //printf("Connecting to: %s ... \r\n", _ssid);`
`170`	`169`	`ret = wifi_connect(_ssid, sec, _pass, strlen(_ssid), strlen(_pass), 0, (void *)NULL);`
`171`	`170`	`if (ret != RTW_SUCCESS) {`
`172`	`171`	`printf("failed: %d\r\n", ret);`
`173`	`172`	`return NSAPI_ERROR_NO_CONNECTION;`
`174`	`173`	`}`
`175`		`- //printf("connected\r\n");`
`176`	`174`
`177`	`175`	`wlan_emac_link_change(true);`
`178`	`176`	`return mbed_lwip_bringup(_dhcp,`
`@@ -232,13 +230,11 @@ nsapi_error_t RTWInterface::disconnect()`
`232`	`230`	`wlan_emac_link_change(false);`
`233`	`231`	`if(wifi_is_connected_to_ap() != RTW_SUCCESS)`
`234`	`232`	`return NSAPI_ERROR_NO_CONNECTION;`
`235`		`- //printf("Deassociating AP ...\r\n");`
`236`	`233`	`if(wifi_disconnect()<0){`
`237`	`234`	`return NSAPI_ERROR_DEVICE_ERROR;`
`238`	`235`	`}`
`239`	`236`	`while(1){`
`240`	`237`	`if(wext_get_ssid(WLAN0_NAME, (unsigned char *) essid) < 0) {`
`241`		`- //printf("WIFI disconnected\n\r");`
`242`	`238`	`break;`
`243`	`239`	`}`
`244`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,15 +106,13 @@ static bool wlan_link_out(emac_interface_t emac, emac_stack_mem_t buf)`
`106`	`106`
`107`	`107`	`static bool wlan_power_up(emac_interface_t *emac)`
`108`	`108`	`{`
`109`		`- //printf("Powering up WiFi ...\r\n");`
`110`	`109`	`wifi_on(RTW_MODE_STA);`
`111`	`110`	`wait_ms(1000);`
`112`	`111`	`return true;`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`static void wlan_power_down(emac_interface_t *emac)`
`116`	`115`	`{`
`117`		`- //printf("Powering down WiFi ...\r\n");`
`118`	`116`	`wifi_off();`
`119`	`117`	`}`
`120`	`118`
Original file line number	Diff line number	Diff line change
`@@ -196,13 +196,10 @@ void serial_baud(serial_t *obj, int baudrate) {`
`196`	`196`	`}`
`197`	`197`	`#endif`
`198`	`198`	`PHAL_RUART_ADAPTER pHalRuartAdapter;`
`199`		`- //PHAL_RUART_OP pHalRuartOp;`
`200`	`199`
`201`	`200`	`pHalRuartAdapter = &(obj->hal_uart_adp);`
`202`		`- //pHalRuartOp = &(obj->hal_uart_op);`
`203`	`201`
`204`	`202`	`pHalRuartAdapter->BaudRate = baudrate;`
`205`		`-// HalRuartInit(pHalRuartAdapter);`
`206`	`203`	`HalRuartSetBaudRate((VOID*)pHalRuartAdapter);`
`207`	`204`	`}`
`208`	`205`