diff options
| -rwxr-xr-x | apps/examples/wlan/wlan_main.c | 164 | ||||
| -rwxr-xr-x | misc/drivers/rtl8187x/rtl8187x.c | 127 |
2 files changed, 153 insertions, 138 deletions
diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c index 9993e8deb..04210909a 100755 --- a/apps/examples/wlan/wlan_main.c +++ b/apps/examples/wlan/wlan_main.c @@ -122,14 +122,14 @@ static struct usbhost_driver_s *g_drvr; ****************************************************************************/ /**************************************************************************** - * Name: wlan_waiter + * Name: wlan_bringup * * Description: * Wait for USB devices to be connected. * ****************************************************************************/ -static int wlan_waiter(int argc, char *argv[]) +static inline void wlan_bringup(void) { #if defined(CONFIG_EXAMPLE_WLAN_DHCPC) || defined(CONFIG_EXAMPLE_WLAN_NOMAC) uint8_t mac[IFHWADDRLEN]; @@ -138,6 +138,92 @@ static int wlan_waiter(int argc, char *argv[]) #ifdef CONFIG_EXAMPLE_WLAN_DHCPC void *handle; #endif + + /* Many embedded network interfaces must have a software assigned + * MAC + */ + +#ifdef CONFIG_EXAMPLE_WLAN_NOMAC + mac[0] = 0x00; + mac[1] = 0xe0; + mac[2] = 0xb0; + mac[3] = 0x0b; + mac[4] = 0xba; + mac[5] = 0xbe; + uip_setmacaddr("eth0", mac); +#endif + + /* Set up the default router address */ + + addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_DRIPADDR); + uip_setdraddr("eth0", &addr); + + /* Setup the subnet mask */ + + addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_NETMASK); + uip_setnetmask("eth0", &addr); + + /* Set up our host address */ + +#ifdef CONFIG_EXAMPLE_WLAN_DHCPC + addr.s_addr = 0; +#else + addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_IPADDR); +#endif + uip_sethostaddr("eth0", &addr); + +#ifdef CONFIG_EXAMPLE_WLAN_DHCPC + /* Set up the resolver */ + + resolv_init(); + + /* Get the MAC address of the NIC */ + + uip_getmacaddr("eth0", mac); + + /* Set up the DHCPC modules */ + + handle = dhcpc_open(&mac, IFHWADDRLEN); + + /* Get an IP address. Note: there is no logic here for renewing + * the address in this example. The address should be renewed in + * ds.lease_time/2 seconds. + */ + + printf("Getting IP address\n"); + if (handle) + { + struct dhcpc_state ds; + (void)dhcpc_request(handle, &ds); + uip_sethostaddr("eth1", &ds.ipaddr); + if (ds.netmask.s_addr != 0) + { + uip_setnetmask("eth0", &ds.netmask); + } + if (ds.default_router.s_addr != 0) + { + uip_setdraddr("eth0", &ds.default_router); + } + if (ds.dnsaddr.s_addr != 0) + { + resolv_conf(&ds.dnsaddr); + } + dhcpc_close(handle); + printf("IP: %s\n", inet_ntoa(ds.ipaddr)); + } +#endif +} + +/**************************************************************************** + * Name: wlan_waiter + * + * Description: + * Wait for USB devices to be connected. + * + ****************************************************************************/ + +static int wlan_waiter(int argc, char *argv[]) +{ bool connected = false; int ret; @@ -162,79 +248,7 @@ static int wlan_waiter(int argc, char *argv[]) /* If the enumeration was successful, then bring up the interface */ - /* Many embedded network interfaces must have a software assigned - * MAC - */ - -#ifdef CONFIG_EXAMPLE_WLAN_NOMAC - mac[0] = 0x00; - mac[1] = 0xe0; - mac[2] = 0xb0; - mac[3] = 0x0b; - mac[4] = 0xba; - mac[5] = 0xbe; - uip_setmacaddr("eth0", mac); -#endif - - /* Set up our host address */ - -#ifdef CONFIG_EXAMPLE_WLAN_DHCPC - addr.s_addr = 0; -#else - addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_IPADDR); -#endif - uip_sethostaddr("eth0", &addr); - - /* Set up the default router address */ - - addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_DRIPADDR); - uip_setdraddr("eth0", &addr); - - /* Setup the subnet mask */ - - addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_NETMASK); - uip_setnetmask("eth0", &addr); - -#ifdef CONFIG_EXAMPLE_WLAN_DHCPC - /* Set up the resolver */ - - resolv_init(); - - /* Get the MAC address of the NIC */ - - uip_getmacaddr("eth0", mac); - - /* Set up the DHCPC modules */ - - handle = dhcpc_open(&mac, IFHWADDRLEN); - - /* Get an IP address. Note: there is no logic here for renewing - * the address in this example. The address should be renewed in - * ds.lease_time/2 seconds. - */ - - printf("Getting IP address\n"); - if (handle) - { - struct dhcpc_state ds; - (void)dhcpc_request(handle, &ds); - uip_sethostaddr("eth1", &ds.ipaddr); - if (ds.netmask.s_addr != 0) - { - uip_setnetmask("eth0", &ds.netmask); - } - if (ds.default_router.s_addr != 0) - { - uip_setdraddr("eth0", &ds.default_router); - } - if (ds.dnsaddr.s_addr != 0) - { - resolv_conf(&ds.dnsaddr); - } - dhcpc_close(handle); - printf("IP: %s\n", inet_ntoa(ds.ipaddr)); - } -#endif + wlan_bringup(); } } diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index 2016bd17f..3461b2b91 100755 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -781,7 +781,7 @@ static inline int rtl8187x_cfgdesc(FAR struct rtl8187x_state_s *priv, configdesc += cfgdesc->len; remaining -= cfgdesc->len; - /* Loop where there are more dscriptors to examine */ + /* Loop while there are more descriptors to examine */ while (remaining >= sizeof(struct usb_desc_s)) { @@ -3583,106 +3583,107 @@ static int rtl8187x_reset(struct rtl8187x_state_s *priv) * consumption about 30 mA */ - rtl8187x_iowrite8(priv, (uint8_t *)0xFF61, 0x10); - regval = rtl818x_ioread8(priv, (uint8_t *)0xFF62); - rtl8187x_iowrite8(priv, (uint8_t *)0xFF62, regval & ~(1 << 5)); - rtl8187x_iowrite8(priv, (uint8_t *)0xFF62, regval | (1 << 5)); + rtl8187x_iowrite8(priv, (uint8_t*)0xff61, 0x10); + regval = rtl818x_ioread8(priv, (uint8_t*)0xff62); + rtl8187x_iowrite8(priv, (uint8_t*)0xff62, regval & ~(1 << 5)); + rtl8187x_iowrite8(priv, (uint8_t*)0xff62, regval | (1 << 5)); ret = rtl8187_cmd_reset(dev); if (ret != 0) - return ret; - + { + return ret; + } rtl8187x_anaparamon(priv) /* BRSR (Basic Rate Set Register) on 8187B looks to be the same as * RESP_RATE on 8187L in Realtek sources: each bit should be each - * one of the 12 rates, all are enabled */ - rtl8187x_iowrite16(priv, (__le16 *)0xFF34, 0x0FFF); + * one of the 12 rates, all are enabled + */ + + rtl8187x_iowrite16(priv, (uint16_t*)0xff34, 0x0fff); - regval = rtl818x_ioread8(priv, &priv->map->CW_CONF); + regval = rtl818x_ioread8(priv, RTL8187X_ADDR_CWCONF); regval |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT; - rtl8187x_iowrite8(priv, &priv->map->CW_CONF, regval); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_CWCONF, regval); /* Auto Rate Fallback Register (ARFR): 1M-54M setting */ - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFFE0, 0x0FFF, 1); - rtl8187x_iowrite8_idx(priv, (uint8_t *)0xFFE2, 0x00, 1); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFFD4, 0xFFFF, 1); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xffe0, 0x0fff, 1); + rtl8187x_iowrite8_idx(priv, (uint8_t*)0xffe2, 0x00, 1); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xffd4, 0xffff, 1); - rtl8187x_iowrite8(priv, &priv->map->EEPROM_CMD, - RTL818X_EEPROM_CMD_CONFIG); - regval = rtl818x_ioread8(priv, &priv->map->CONFIG1); - rtl8187x_iowrite8(priv, &priv->map->CONFIG1, (regval & 0x3F) | 0x80); - rtl8187x_iowrite8(priv, &priv->map->EEPROM_CMD, - RTL818X_EEPROM_CMD_NORMAL); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_EEPROMCMD, RTL818X_EEPROMCMD_CONFIG); + regval = rtl818x_ioread8(priv, RTL8187X_ADDR_CONFIG1); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_CONFIG1, (regval & 0x3F) | 0x80); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_EEPROMCMD, RTL818X_EEPROMCMD_NORMAL); - rtl8187x_iowrite8(priv, &priv->map->WPA_CONF, 0); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_WPACONF, 0); for (i = 0; i < ARRAY_SIZE(rtl8187b_reg_table); i++) { rtl8187x_iowrite8_idx(priv, - (uint8_t *)(uintptr_t) - (rtl8187b_reg_table[i][0] | 0xFF00), + (uint8_t*)(uintptr_t) + (rtl8187b_reg_table[i][0] | 0xff00), rtl8187b_reg_table[i][1], rtl8187b_reg_table[i][2]); } - rtl8187x_iowrite16(priv, &priv->map->TID_AC_MAP, 0xFA50); - rtl8187x_iowrite16(priv, &priv->map->INT_MIG, 0); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_TIDACMAP, 0xFA50); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_INTMIG, 0); - rtl8187x_iowrite32_idx(priv, (__le32 *)0xFFF0, 0, 1); - rtl8187x_iowrite32_idx(priv, (__le32 *)0xFFF4, 0, 1); - rtl8187x_iowrite8_idx(priv, (uint8_t *)0xFFF8, 0, 1); + rtl8187x_iowrite32_idx(priv, (uint32_t*)0xfff0, 0, 1); + rtl8187x_iowrite32_idx(priv, (uint32_t*)0xfff4, 0, 1); + rtl8187x_iowrite8_idx(priv, (uint8_t*)0xfff8, 0, 1); - rtl8187x_iowrite32(priv, &priv->map->RF_TIMING, 0x00004001); + rtl8187x_iowrite32(priv, RTL8187X_ADDR_RFTIMING, 0x00004001); /* RFSW_CTRL register */ - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF72, 0x569A, 2); - - rtl8187x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480); - rtl8187x_iowrite16(priv, &priv->map->RFPinsSelect, 0x2488); - rtl8187x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xFF72, 0x569A, 2); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_RFPINSOUTPUT, 0x0480); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_RFPINSSELECT, 0x2488); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_RFPINSENABLE, 0x1fff); msleep(100); priv->rf->init(dev); regval = RTL818X_CMD_TX_ENABLE | RTL818X_CMD_RX_ENABLE; - rtl8187x_iowrite8(priv, &priv->map->CMD, regval); - rtl8187x_iowrite16(priv, &priv->map->INT_MASK, 0xFFFF); - - rtl8187x_iowrite8(priv, (uint8_t *)0xFE41, 0xF4); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE40, 0x00); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE42, 0x00); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE42, 0x01); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE40, 0x0F); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE42, 0x00); - rtl8187x_iowrite8(priv, (uint8_t *)0xFE42, 0x01); - - regval = rtl818x_ioread8(priv, (uint8_t *)0xFFDB); - rtl8187x_iowrite8(priv, (uint8_t *)0xFFDB, regval | (1 << 2)); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF72, 0x59FA, 3); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF74, 0x59D2, 3); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF76, 0x59D2, 3); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF78, 0x19FA, 3); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF7A, 0x19FA, 3); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFF7C, 0x00D0, 3); - rtl8187x_iowrite8(priv, (uint8_t *)0xFF61, 0); - rtl8187x_iowrite8_idx(priv, (uint8_t *)0xFF80, 0x0F, 1); - rtl8187x_iowrite8_idx(priv, (uint8_t *)0xFF83, 0x03, 1); - rtl8187x_iowrite8(priv, (uint8_t *)0xFFDA, 0x10); - rtl8187x_iowrite8_idx(priv, (uint8_t *)0xFF4D, 0x08, 2); - - rtl8187x_iowrite32(priv, &priv->map->HSSI_PARA, 0x0600321B); - rtl8187x_iowrite16_idx(priv, (__le16 *)0xFFEC, 0x0800, 1); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_CMD, regval); + rtl8187x_iowrite16(priv, RTL8187X_ADDR_INTMASK, 0xffff); + + rtl8187x_iowrite8(priv, (uint8_t*)0xfe41, 0xf4); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe40, 0x00); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe42, 0x00); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe42, 0x01); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe40, 0x0f); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe42, 0x00); + rtl8187x_iowrite8(priv, (uint8_t*)0xfe42, 0x01); + + regval = rtl818x_ioread8(priv, (uint8_t*)0xffdb); + rtl8187x_iowrite8(priv, (uint8_t*)0xffdb, regval | (1 << 2)); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff72, 0x59fa, 3); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff74, 0x59d2, 3); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff76, 0x59d2, 3); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff78, 0x19fa, 3); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff7a, 0x19fa, 3); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xff7c, 0x00d0, 3); + rtl8187x_iowrite8(priv, (uint8_t*)0xff61, 0); + rtl8187x_iowrite8_idx(priv, (uint8_t*)0xff80, 0x0f, 1); + rtl8187x_iowrite8_idx(priv, (uint8_t*)0xff83, 0x03, 1); + rtl8187x_iowrite8(priv, (uint8_t*)0xffda, 0x10); + rtl8187x_iowrite8_idx(priv, (uint8_t*)0xff4d, 0x08, 2); + + rtl8187x_iowrite32(priv, rtl8187x_addr_hssipara, 0x0600321b); + rtl8187x_iowrite16_idx(priv, (uint16_t*)0xffec, 0x0800, 1); priv->slot_time = 0x9; priv->aifsn[0] = 2; /* AIFSN[AC_VO] */ priv->aifsn[1] = 2; /* AIFSN[AC_VI] */ priv->aifsn[2] = 7; /* AIFSN[AC_BK] */ priv->aifsn[3] = 3; /* AIFSN[AC_BE] */ - rtl8187x_iowrite8(priv, &priv->map->ACM_CONTROL, 0); + rtl8187x_iowrite8(priv, RTL8187X_ADDR_ACMCONTROL, 0); /* ENEDCA flag must always be set, transmit issues? */ - rtl8187x_iowrite8(priv, &priv->map->MSR, RTL818X_MSR_ENEDCA); + + rtl8187x_iowrite8(priv, RTL8187X_ADDR_MSR, RTL818X_MSR_ENEDCA); #else /* reset */ |