ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11888 from fredlee12001/master 

Pelion enable for UNO_91H
pull/11911/head
Martin Kojtal 2019-11-20 16:31:56 +01:00 committed by GitHub
parent 48f38a420b 72c5c78642
commit 9dc0c3737e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 180 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
features/netsocket/emac-drivers/TARGET_RDA_EMAC/RdaWiFiInterface.cpp
View File

@ -21,6 +21,45 @@
#include "wland_types.h"
#include "rda_sys_wrapper.h"
typedef enum {
WIFI_CONNECTED,
WIFI_DISCONNECTED,
}WIFI_STATE;
static WIFI_STATE wifi_state = WIFI_DISCONNECTED;
void daemon(void *para)
{
void *main_msgQ = NULL;
rda_msg msg;
int ret;
RDAWiFiInterface *wifi = (RDAWiFiInterface *)para;
main_msgQ = rda_mail_create(10, sizeof(unsigned int)*4);
wifi->set_msg_queue(main_msgQ);
while(1){
rda_mail_get(main_msgQ, (void*)&msg, osWaitForever);
switch(msg.type)
{
case MAIN_RECONNECT:
printf("wifi disconnect!\r\n");
ret = wifi->disconnect();
if(ret != 0){
printf("disconnect failed!\r\n");
break;
}
ret = wifi->reconnect();
while(ret != 0){
osDelay(5*1000);
ret = wifi->reconnect();
};
break;
default:
printf("unknown msg\r\n");
break;
}
}
}
nsapi_error_t RDAWiFiInterface::set_channel(uint8_t channel)
{
int ret= 0;
@ -52,7 +91,7 @@ nsapi_error_t RDAWiFiInterface::init()
{
if (!_interface) {
if (!_emac.power_up()) {
LWIP_DEBUGF(NETIF_DEBUG,"power up failed!\n");
LWIP_DEBUGF(NETIF_DEBUG,("power up failed!\n"));
}
nsapi_error_t err = _stack.add_ethernet_interface(_emac, true, &_interface);
if (err != NSAPI_ERROR_OK) {
@ -60,6 +99,7 @@ nsapi_error_t RDAWiFiInterface::init()
return err;
}
_interface->attach(_connection_status_cb);
//rda_thread_new("daemon", daemon, this, DEFAULT_THREAD_STACKSIZE*4, osPriorityNormal);
}
return NSAPI_ERROR_OK;
}
@ -93,12 +133,22 @@ nsapi_error_t RDAWiFiInterface::connect(const char *ssid, const char *pass,
rda5981_scan_result bss;
int ret = 0;
if(wifi_state == WIFI_CONNECTED) {
return NSAPI_ERROR_IS_CONNECTED;
}
if (ssid == NULL || ssid[0] == 0) {
return NSAPI_ERROR_PARAMETER;
}
set_credentials(ssid, pass, security);
set_channel(channel);
init();
//reset all scan result to avoid any previous stored SSID/PW/CHANNEL
rda5981_del_scan_all_result();
rda5981_scan(NULL,0,0);
if(rda5981_check_scan_result_name(ssid) != 0) {
for (i = 0; i< 5; i++) {
rda5981_scan(NULL, 0, 0);
@ -112,13 +162,13 @@ nsapi_error_t RDAWiFiInterface::connect(const char *ssid, const char *pass,
}
if (find == false) {
LWIP_DEBUGF(NETIF_DEBUG,"can not find the ap.\r\n");
return NSAPI_ERROR_CONNECTION_TIMEOUT;
LWIP_DEBUGF(NETIF_DEBUG,("can not find the ap.\r\n"));
return NSAPI_ERROR_NO_SSID;
}
bss.channel = 15;
rda5981_get_scan_result_name(&bss, ssid);
if ((channel !=0) && (bss.channel != channel)) {
LWIP_DEBUGF(NETIF_DEBUG, "invalid channel\r\n");
LWIP_DEBUGF(NETIF_DEBUG, ("invalid channel\r\n"));
return NSAPI_ERROR_CONNECTION_TIMEOUT;
}
@ -135,6 +185,8 @@ nsapi_error_t RDAWiFiInterface::connect(const char *ssid, const char *pass,
if (ret) {
return NSAPI_ERROR_CONNECTION_TIMEOUT;
}
wifi_state = WIFI_CONNECTED;
ret = _interface->bringup(_dhcp,
_ip_address[0] ? _ip_address : 0,
@ -142,6 +194,14 @@ nsapi_error_t RDAWiFiInterface::connect(const char *ssid, const char *pass,
_gateway[0] ? _gateway : 0,
DEFAULT_STACK,
_blocking);
LWIP_DEBUGF(NETIF_DEBUG,("Interface bringup up status:%d\r\n",ret));
if( ret == NSAPI_ERROR_OK || ret == NSAPI_ERROR_IS_CONNECTED ) {
ret = NSAPI_ERROR_OK;
}
else if( ret == NSAPI_ERROR_DHCP_FAILURE) {
disconnect();
}
return ret;
}
@ -156,9 +216,10 @@ nsapi_error_t RDAWiFiInterface::disconnect()
{
rda_msg msg;
if(sta_state < 2) {
if(wifi_state == WIFI_DISCONNECTED) {
return NSAPI_ERROR_NO_CONNECTION;
}
wifi_state = WIFI_DISCONNECTED;
void* wifi_disconnect_sem = rda_sem_create(0);
msg.type = WLAND_DISCONNECT;
msg.arg1 = (unsigned int)wifi_disconnect_sem;
@ -172,6 +233,81 @@ nsapi_error_t RDAWiFiInterface::disconnect()
return NSAPI_ERROR_NO_CONNECTION;
}
nsapi_error_t RDAWiFiInterface::reconnect()
{
rda_msg msg;
bool find = false;
int i = 0;
rda5981_scan_result bss;
int ret = 0;
if (_ssid == NULL || _ssid[0] == 0) {
return NSAPI_ERROR_PARAMETER;
}
rda5981_del_scan_all_result();
if(rda5981_check_scan_result_name(_ssid) != 0) {
for (i = 0; i< 5; i++) {
rda5981_scan(NULL, 0, 0);
if(rda5981_check_scan_result_name(_ssid) == 0) {
find = true;
break;
}
}
} else {
find = true;
}
if (find == false) {
LWIP_DEBUGF(NETIF_DEBUG,"can not find the ap.\r\n");
return NSAPI_ERROR_CONNECTION_TIMEOUT;
}
bss.channel = 15;
rda5981_get_scan_result_name(&bss, _ssid);
if ((_channel !=0) && (bss.channel != _channel)) {
LWIP_DEBUGF(NETIF_DEBUG, "invalid channel\r\n");
return NSAPI_ERROR_CONNECTION_TIMEOUT;
}
memcpy(gssid, _ssid, strlen(_ssid));
if (_pass[0] != 0) {
memcpy(gpass, _pass, strlen(_pass));
}
memset(gbssid, 0, NSAPI_MAC_BYTES);
gssid[strlen(_ssid)] = gpass[strlen(_pass)] = '\0';
msg.type = WLAND_CONNECT;
rda_mail_put(wland_msgQ, (void*)&msg, osWaitForever);
ret = rda_sem_wait(wifi_auth_sem, 10000);
if (ret) {
return NSAPI_ERROR_CONNECTION_TIMEOUT;
}
if(_dhcp) {
memset(_ip_address, 0, sizeof(_ip_address));
memset(_netmask, 0, sizeof(_netmask));
memset(_gateway, 0, sizeof(_gateway));
}
ret = _interface->bringup(_dhcp,
_ip_address[0] ? _ip_address : 0,
_netmask[0] ? _netmask : 0,
_gateway[0] ? _gateway : 0,
DEFAULT_STACK,
_blocking);
LWIP_DEBUGF(NETIF_DEBUG,("Interface bringup up status:%d\r\n",ret));
if( ret == NSAPI_ERROR_OK || ret == NSAPI_ERROR_IS_CONNECTED ) {
ret = NSAPI_ERROR_OK;
wifi_state = WIFI_CONNECTED;
}
else if( ret == NSAPI_ERROR_DHCP_FAILURE) {
disconnect();
}
return ret;
}
nsapi_size_or_error_t RDAWiFiInterface::scan(WiFiAccessPoint *res, nsapi_size_t count)
{
int bss_num = 0, i;
@ -219,3 +355,10 @@ WiFiInterface *WiFiInterface::get_default_instance() {
static RDAWiFiInterface wifinet;
return &wifinet;
}
nsapi_size_or_error_t RDAWiFiInterface::set_msg_queue(void *queue)
{
//TO_DO: No need for 1st stage since application already control the logic.
//rda5981_set_main_queue(queue);
return 0;
}

11
features/netsocket/emac-drivers/TARGET_RDA_EMAC/RdaWiFiInterface.h
View File

@ -107,6 +107,14 @@ class RDAWiFiInterface : public EMACInterface, public WiFiInterface
*/
virtual nsapi_error_t disconnect();
/** Restart the interface
*
* Attempts to reconnect to a WiFi network. Ssid and passphrase has been stored.
*
* @return 0 on success, negative error code on failure
*/
virtual nsapi_error_t reconnect();
/** Scan for available networks
*
* This function will block. If the @a count is 0, function will only return count of available networks, so that
@ -121,6 +129,9 @@ class RDAWiFiInterface : public EMACInterface, public WiFiInterface
virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, nsapi_size_t count);
virtual nsapi_size_or_error_t init();
virtual nsapi_size_or_error_t set_msg_queue(void *queue);
private:
char _ssid[33];
char _pass[65];

4
targets/TARGET_RDA/TARGET_UNO_91H/device/RDA5981_nvic_virtual.h
View File

@ -25,8 +25,8 @@
//#include "cmsis.h"
//#include <stdint.h>
#include "rda_ccfg_api.h"
extern void rda_ccfg_ckrst(void);
extern void rda_wdt_softreset(void);
#ifdef __cplusplus
extern "C" {
@ -38,7 +38,7 @@ extern "C" {
*/
__NO_RETURN __STATIC_INLINE void __RDA5981_SystemReset(void)
{
rda_ccfg_perrst();
rda_ccfg_ckrst () ;
__DSB(); /* Ensure all outstanding memory accesses included
buffered write are completed before reset */

5
targets/TARGET_RDA/TARGET_UNO_91H/device/system_RDA5991H.c
View File

@ -173,7 +173,10 @@ void SystemInit (void)
#if ((__FPU_PRESENT == 1) && (__FPU_USED == 1))
SCB->CPACR |= ((3UL << 10*2) | (3UL << 11*2)); /* set CP10, CP11 Full Access */
#endif /* ((__FPU_PRESENT == 1) && (__FPU_USED == 1)) */
SCB->VTOR = RDA_CODE_BASE; /* vector table in flash */
#ifndef APPLICATION_ADDR
#define APPLICATION_ADDR RDA_CODE_BASE /* vector table in flash, add support for bootloader jump */
#endif
SCB->VTOR = APPLICATION_ADDR;
NVIC_SetPriorityGrouping(0x06); /* 1 bit for pre-emption pri */
__enable_irq();

4
targets/TARGET_RDA/TARGET_UNO_91H/flash_api.c
View File

@ -22,7 +22,7 @@
#define MBED_FLASH_SIZE 0x100000
#else
//there is 4K BOOTROM at beginning of the flash
#define MBED_FLASH_SIZE (MBED_ROM_SIZE+0x1000)
#define MBED_FLASH_SIZE MBED_ROM_SIZE
#endif
@ -75,7 +75,7 @@ static const sector_info_t sectors_info[] = {
static const flash_target_config_t flash_target_config = {
.page_size = 0x100,
.flash_start = 0x18000000,
.flash_start = 0x18001000,
.flash_size = MBED_FLASH_SIZE,
.sectors = sectors_info,
.sector_info_count = sizeof(sectors_info) / sizeof(sector_info_t)

8
targets/TARGET_RDA/TARGET_UNO_91H/rda_ccfg_api.c
View File

@ -78,6 +78,12 @@ static inline void rda_ccfg_ck(void)
cfg = (RDA_SCU->CORECFG >> 11) & 0x07U;
rd_rf_usb_reg(0xA4, &val, 0);
// If i2c_wakeup_en is already set, do nothing and return
if((val & 0x01U) == 0x00U) {
return;
}
#if ((SYS_CPU_CLK == CLK_FREQ_160M) && (AHB_BUS_CLK == CLK_FREQ_80M))
/* HCLK inv */
if(((CLK_FREQ_40M << 1) | CLK_FREQ_40M) == cfg) {
@ -227,6 +233,8 @@ void rda_ccfg_ckrst(void)
/* Config BUS clock */
val &= ~(0x01U << 9);
val |= (0x00U << 9); /* 1'b0:40M, 1'b1:80M */
val |= (0x01U); /* clear i2c_wakeup_en */
wr_rf_usb_reg(0xA4, val, 0);
}

8
targets/TARGET_RDA/TARGET_UNO_91H/serial_api.c
View File

@ -321,7 +321,7 @@ int serial_getc(serial_t *obj)
void serial_putc(serial_t *obj, int c)
{
while (serial_writable(obj));
while (!serial_writable(obj));
obj->uart->THR = c;
}
@ -334,12 +334,12 @@ int serial_writable(serial_t *obj)
{
int isWritable = 1;
if (obj->index == 0) {
return (obj->uart->FSR & TXFIFO_FULL_MASK); // uart0 not have flow control
return !(obj->uart->FSR & TXFIFO_FULL_MASK); // uart0 not have flow control
} else {
if (((obj->uart->MCR & AFCE_MASK) == 0x00UL) && (NC != uart_data[obj->index].sw_cts.pin)) //If flow control: writable if CTS low + UART done
isWritable = (gpio_read(&uart_data[obj->index].sw_cts) == 0) && (obj->uart->FSR & TXFIFO_FULL_MASK);
isWritable = (gpio_read(&uart_data[obj->index].sw_cts) == 0) && !(obj->uart->FSR & TXFIFO_FULL_MASK);
else
isWritable = (obj->uart->FSR & TXFIFO_FULL_MASK);
isWritable = !(obj->uart->FSR & TXFIFO_FULL_MASK);
return isWritable;
}
}

1
targets/TARGET_RDA/TARGET_UNO_91H/us_ticker.c
View File

@ -41,7 +41,6 @@ extern void rda_timer_irq_set(void);
void us_ticker_init(void)
{
if (us_ticker_inited) {
us_ticker_disable_interrupt();
return;
}