fixed the compiling error while defined RT_USING_PPP

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2467 bbd45198-f89e-11dd-88c7-29a3b14d5316

components/net/lwip/SConscript

@@ -47,8 +47,6 @@ src/core/snmp/mib_structs.c
 src/core/snmp/msg_in.c
 src/core/snmp/msg_out.c
 """)
-if GetDepend(['RT_LWIP_PPP']):
-    src += ppp_src
 
 ppp_src = Split("""
 src/netif/ppp/auth.c
@@ -67,18 +65,18 @@ src/netif/ppp/vj.c
 """)
 
 # The set of source files associated with this SConscript file.
-path = [RTT_ROOT + '/components/net/lwip/src',
-    RTT_ROOT + '/components/net/lwip/src/include',
-    RTT_ROOT + '/components/net/lwip/src/include/ipv4',
-    RTT_ROOT + '/components/net/lwip/src/arch/include',
-    RTT_ROOT + '/components/net/lwip/src/include/netif']
+path = [GetCurrentDir() + '/src',
+    GetCurrentDir() + '/src/include',
+    GetCurrentDir() + '/src/include/ipv4',
+    GetCurrentDir() + '/src/arch/include',
+    GetCurrentDir() + '/src/include/netif']
 
 if GetDepend(['RT_LWIP_SNMP']):
     src += snmp_src
 
 if GetDepend(['RT_LWIP_PPP']):
     src += ppp_src
-    path += [RTT_ROOT + '/components/net/lwip/src/netif/ppp']
+    path += [GetCurrentDir() + '/src/netif/ppp']
 
 # For testing apps
 if GetDepend(['RT_USING_NETUTILS']):

components/net/lwip/src/arch/sys_arch.c

@@ -9,6 +9,7 @@
 #include "lwip/netif.h"
 #include "lwip/tcpip.h"
 #include "netif/ethernetif.h"
+#include "lwip/sio.h"
 
 #include <string.h>
 
@@ -16,7 +17,7 @@ static err_t netif_device_init(struct netif *netif)
 {
     struct eth_device *ethif;
 
-	ethif = (struct eth_device*)netif->state;
+    ethif = (struct eth_device *)netif->state;
     if (ethif != RT_NULL)
     {
         rt_device_t device;
@@ -59,13 +60,15 @@ static void tcpip_init_done_callback(void *arg)
 
     /* for each network interfaces */
     information = &rt_object_container[RT_Object_Class_Device];
-	for (node = information->object_list.next; node != &(information->object_list); node = node->next)
+    for (node = information->object_list.next;
+         node != &(information->object_list);
+         node = node->next)
     {
         object = rt_list_entry(node, struct rt_object, list);
-		device = (rt_device_t) object;
+        device = (rt_device_t)object;
         if (device->type == RT_Device_Class_NetIf)
         {
-			ethif = (struct eth_device*)device;
+            ethif = (struct eth_device *)device;
 
             /* leave critical */
             rt_exit_critical();
@@ -116,18 +119,20 @@ void lwip_system_init(void)
 
     rc = rt_sem_init(&done_sem, "done", 0, RT_IPC_FLAG_FIFO);
 
-	if(rc != RT_EOK)
+    if (rc != RT_EOK)
     {
         LWIP_ASSERT("Failed to create semaphore", 0);
+
         return;
     }
 
-	tcpip_init(tcpip_init_done_callback,(void *)&done_sem);
+    tcpip_init(tcpip_init_done_callback, (void *)&done_sem);
 
     /* waiting for initialization done */
     if (rt_sem_take(&done_sem, RT_WAITING_FOREVER) != RT_EOK)
     {
         rt_sem_detach(&done_sem);
+
         return;
     }
     rt_sem_detach(&done_sem);
@@ -166,26 +171,25 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count)
     RT_DEBUG_NOT_IN_INTERRUPT;
 
     rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_SEM_NAME, counter);
-	counter++;
+    counter ++;
 
     tmpsem = rt_sem_create(tname, count, RT_IPC_FLAG_FIFO);
-	if( tmpsem == RT_NULL )
+    if (tmpsem == RT_NULL)
         return ERR_MEM;
     else
     {
         *sem = tmpsem;
+
         return ERR_OK;
     }
 }
 
-
 void sys_sem_free(sys_sem_t *sem)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
     rt_sem_delete(*sem);
 }
 
-
 void sys_sem_signal(sys_sem_t *sem)
 {
     rt_sem_release(*sem);
@@ -201,7 +205,8 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout)
 
     /* get the begin tick */
     tick = rt_tick_get();
-	if(timeout == 0) t = RT_WAITING_FOREVER;
+    if (timeout == 0)
+        t = RT_WAITING_FOREVER;
     else
     {
         /* convert msecond to os tick */
@@ -225,7 +230,7 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout)
     tick = rt_tick_get() - tick;
 
     /* convert tick to msecond */
-	tick = tick * (1000/RT_TICK_PER_SECOND);
+    tick = tick * (1000 / RT_TICK_PER_SECOND);
     if (tick == 0)
         tick = 1;
 
@@ -233,26 +238,30 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout)
 }
 
 #ifndef sys_sem_valid
-/** Check if a semaphore is valid/allocated: return 1 for valid, 0 for invalid */
+/** Check if a semaphore is valid/allocated:
+ *  return 1 for valid, 0 for invalid
+ */
 int sys_sem_valid(sys_sem_t *sem)
 {
     return (int)(*sem);
 }
 #endif
+
 #ifndef sys_sem_set_invalid
-/** Set a semaphore invalid so that sys_sem_valid returns 0 */
+/** Set a semaphore invalid so that sys_sem_valid returns 0
+ */
 void sys_sem_set_invalid(sys_sem_t *sem)
 {
     *sem = RT_NULL;
 }
 #endif
 
-
 /* ====================== Mutex ====================== */
 
 /** Create a new mutex
  * @param mutex pointer to the mutex to create
- * @return a new mutex */
+ * @return a new mutex
+ */
 err_t sys_mutex_new(sys_mutex_t *mutex)
 {
     static unsigned short counter = 0;
@@ -262,20 +271,22 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
     RT_DEBUG_NOT_IN_INTERRUPT;
 
     rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MUTEX_NAME, counter);
-	counter++;
+    counter ++;
 
     tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_FIFO);
-	if( tmpmutex == RT_NULL )
+    if (tmpmutex == RT_NULL)
         return ERR_MEM;
     else
     {
         *mutex = tmpmutex;
+
         return ERR_OK;
     }
 }
 
 /** Lock a mutex
- * @param mutex the mutex to lock */
+ * @param mutex the mutex to lock
+ */
 void sys_mutex_lock(sys_mutex_t *mutex)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
@@ -284,16 +295,17 @@ void sys_mutex_lock(sys_mutex_t *mutex)
     return;
 }
 
-
 /** Unlock a mutex
- * @param mutex the mutex to unlock */
+ * @param mutex the mutex to unlock
+ */
 void sys_mutex_unlock(sys_mutex_t *mutex)
 {
     rt_mutex_release(*mutex);
 }
 
 /** Delete a semaphore
- * @param mutex the mutex to delete */
+ * @param mutex the mutex to delete
+ */
 void sys_mutex_free(sys_mutex_t *mutex)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
@@ -302,7 +314,9 @@ void sys_mutex_free(sys_mutex_t *mutex)
 }
 
 #ifndef sys_mutex_valid
-/** Check if a mutex is valid/allocated: return 1 for valid, 0 for invalid */
+/** Check if a mutex is valid/allocated:
+ *  return 1 for valid, 0 for invalid
+ */
 int sys_mutex_valid(sys_mutex_t *mutex)
 {
     return (int)(*mutex);
@@ -310,7 +324,8 @@ int sys_mutex_valid(sys_mutex_t *mutex)
 #endif
 
 #ifndef sys_mutex_set_invalid
-/** Set a mutex invalid so that sys_mutex_valid returns 0 */
+/** Set a mutex invalid so that sys_mutex_valid returns 0
+ */
 void sys_mutex_set_invalid(sys_mutex_t *mutex)
 {
     *mutex = RT_NULL;
@@ -328,12 +343,13 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int size)
     RT_DEBUG_NOT_IN_INTERRUPT;
 
     rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MBOX_NAME, counter);
-	counter++;
+    counter ++;
 
     tmpmbox = rt_mb_create(tname, size, RT_IPC_FLAG_FIFO);
-	if( tmpmbox != RT_NULL )
+    if (tmpmbox != RT_NULL)
     {
         *mbox = tmpmbox;
+
         return ERR_OK;
     }
 
@@ -352,12 +368,13 @@ void sys_mbox_free(sys_mbox_t *mbox)
 /** Post a message to an mbox - may not fail
  * -> blocks if full, only used from tasks not from ISR
  * @param mbox mbox to posts the message
- * @param msg message to post (ATTENTION: can be NULL) */
+ * @param msg message to post (ATTENTION: can be NULL)
+ */
 void sys_mbox_post(sys_mbox_t *mbox, void *msg)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
 
-	rt_mb_send_wait(*mbox, (rt_uint32_t)msg,RT_WAITING_FOREVER);
+    rt_mb_send_wait(*mbox, (rt_uint32_t)msg, RT_WAITING_FOREVER);
 
     return;
 }
@@ -376,7 +393,8 @@ err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
  * @param timeout maximum time (in milliseconds) to wait for a message
  * @return time (in milliseconds) waited for a message, may be 0 if not waited
            or SYS_ARCH_TIMEOUT on timeout
- *         The returned time has to be accurate to prevent timer jitter! */
+ *         The returned time has to be accurate to prevent timer jitter!
+ */
 u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
 {
     rt_err_t ret;
@@ -412,7 +430,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
     tick = rt_tick_get() - tick;
 
     /* convert tick to msecond */
-	tick = tick * (1000/RT_TICK_PER_SECOND);
+    tick = tick * (1000 / RT_TICK_PER_SECOND);
     if (tick == 0)
         tick = 1;
 
@@ -424,7 +442,8 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
  * @param msg pointer where the message is stored
  * @param timeout maximum time (in milliseconds) to wait for a message
  * @return 0 (milliseconds) if a message has been received
- *         or SYS_MBOX_EMPTY if the mailbox is empty */
+ *         or SYS_MBOX_EMPTY if the mailbox is empty
+ */
 u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg)
 {
     int ret;
@@ -443,26 +462,31 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg)
 }
 
 #ifndef sys_mbox_valid
-/** Check if an mbox is valid/allocated: return 1 for valid, 0 for invalid */
+/** Check if an mbox is valid/allocated:
+ *  return 1 for valid, 0 for invalid
+ */
 int sys_mbox_valid(sys_mbox_t *mbox)
 {
     return (int)(*mbox);
 }
 #endif
+
 #ifndef sys_mbox_set_invalid
-/** Set an mbox invalid so that sys_mbox_valid returns 0 */
+/** Set an mbox invalid so that sys_mbox_valid returns 0
+ */
 void sys_mbox_set_invalid(sys_mbox_t *mbox)
 {
     *mbox = RT_NULL;
 }
 #endif
 
-
-
-
 /* ====================== System ====================== */
 
-sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize, int prio)
+sys_thread_t sys_thread_new(const char    *name,
+                            lwip_thread_fn thread,
+                            void          *arg,
+                            int            stacksize,
+                            int            prio)
 {
     rt_thread_t t;
 
@@ -484,6 +508,7 @@ sys_prot_t sys_arch_protect(void)
 
     /* disable interrupt */
     level = rt_hw_interrupt_disable();
+
     return level;
 }
 
@@ -495,9 +520,52 @@ void sys_arch_unprotect(sys_prot_t pval)
     return;
 }
 
-void sys_arch_assert(const char* file, int line)
+void sys_arch_assert(const char *file, int line)
 {
-	rt_kprintf("\nAssertion: %d in %s, thread %s\n", line, file,
-        rt_thread_self()->name);
+    rt_kprintf("\nAssertion: %d in %s, thread %s\n",
+               line, file, rt_thread_self()->name);
     RT_ASSERT(0);
 }
+
+u32_t sys_jiffies(void)
+{
+    return rt_tick_get();
+}
+
+u32_t sio_read(sio_fd_t fd, u8_t *buf, u32_t size)
+{
+    u32_t len, i;
+
+    RT_ASSERT(fd != RT_NULL);
+
+    len = rt_device_read((rt_device_t)fd, 0, buf, size);
+    if (len <= 0)
+        return 0;
+
+    return len;
+}
+
+u32_t sio_write(sio_fd_t fd, u8_t *buf, u32_t size)
+{
+    u32_t i;
+    RT_ASSERT(fd != RT_NULL);
+
+    return rt_device_write((rt_device_t)fd, 0, buf, size);
+}
+
+void sio_read_abort(sio_fd_t fd)
+{
+    rt_kprintf("read_abort\n");
+}
+
+void ppp_trace(int level, const char *format, ...)
+{
+    va_list args;
+    rt_size_t length;
+    static char rt_log_buf[RT_CONSOLEBUF_SIZE];
+
+    va_start(args, format);
+    length = rt_vsprintf(rt_log_buf, format, args);
+    rt_device_write((rt_device_t)rt_console_get_device(), 0, rt_log_buf, length);
+    va_end(args);
+}