M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: update ppp code for lwip 2.0.0. 

Fixes #499.
This commit is contained in:
whitequark 2016-07-08 09:26:45 +00:00
parent 375e821bd8
commit c7a5ec9e61
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artiq/runtime/main.c
View File

@ -22,7 +22,6 @@
#else #else
#include <netif/ppp/ppp.h> #include <netif/ppp/ppp.h>
#include <netif/ppp/pppos.h> #include <netif/ppp/pppos.h>
#include <lwip/sio.h>
#endif #endif
#include "bridge_ctl.h" #include "bridge_ctl.h"
@ -149,6 +148,13 @@ static void network_init(void)
static int ppp_connected; static int ppp_connected;
static u32_t ppp_output_cb(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
{
for(int i = 0; i < len; i++)
uart_write(data[i]);
return len;
}
static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx)
{ {
if (err_code == PPPERR_NONE) { if (err_code == PPPERR_NONE) {
@ -161,21 +167,12 @@ static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx)
} }
} }
u32_t sio_write(sio_fd_t fd, u8_t *data, u32_t len)
{
int i;
for(i=0;i<len;i++)
uart_write(data[i]);
return len;
}
static void network_init(void) static void network_init(void)
{ {
lwip_init(); lwip_init();
ppp_connected = 0; ppp_connected = 0;
ppp = pppos_create(&netif, NULL, ppp_status_cb, NULL); ppp = pppos_create(&netif, ppp_output_cb, ppp_status_cb, NULL);
ppp_set_auth(ppp, PPPAUTHTYPE_NONE, "", ""); ppp_set_auth(ppp, PPPAUTHTYPE_NONE, "", "");
ppp_set_default(ppp); ppp_set_default(ppp);
ppp_connect(ppp, 0); ppp_connect(ppp, 0);