sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor RTL/WLAN update

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3531 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-04-22 15:54:21 +00:00
parent a4ff160e5a
commit 383fa8a445
1 changed files with 94 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
examples/wlan/wlan_main.c
View File

@ -121,6 +121,99 @@ static struct usbhost_driver_s *g_drvr;
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: wlan_bringup
*
* Description:
* Wait for USB devices to be connected.
*
****************************************************************************/
static inline void wlan_bringup(void)
{
#if defined(CONFIG_EXAMPLE_WLAN_DHCPC) || defined(CONFIG_EXAMPLE_WLAN_NOMAC)
uint8_t mac[IFHWADDRLEN];
#endif
struct in_addr addr;
#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 * Name: wlan_waiter
* *
@ -131,13 +224,6 @@ static struct usbhost_driver_s *g_drvr;
static int wlan_waiter(int argc, char *argv[]) static int wlan_waiter(int argc, char *argv[])
{ {
#if defined(CONFIG_EXAMPLE_WLAN_DHCPC) || defined(CONFIG_EXAMPLE_WLAN_NOMAC)
uint8_t mac[IFHWADDRLEN];
#endif
struct in_addr addr;
#ifdef CONFIG_EXAMPLE_WLAN_DHCPC
void *handle;
#endif
bool connected = false; bool connected = false;
int ret; int ret;
@ -162,79 +248,7 @@ static int wlan_waiter(int argc, char *argv[])
/* If the enumeration was successful, then bring up the interface */ /* If the enumeration was successful, then bring up the interface */
/* Many embedded network interfaces must have a software assigned wlan_bringup();
* 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
} }
} }