mirror of
https://github.com/ep00ch/lwip-contrib-mac.git
synced 2024-07-07 20:29:04 +00:00
update for latest PPP and sio.change some thread prios.put in ctrlc check
This commit is contained in:
parent
fff576d8b8
commit
2751b94b49
@ -492,7 +492,6 @@ cdl_package CYGPKG_NET_LWIP {
|
||||
netif/ppp/md5.c \
|
||||
netif/ppp/randm.c \
|
||||
netif/ppp/vj.c \
|
||||
netif/ppp/target.c \
|
||||
ecos/sio.c
|
||||
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
#include <cyg/io/eth/eth_drv.h>
|
||||
#include <cyg/io/eth/netdev.h>
|
||||
#include <cyg/hal/hal_if.h>
|
||||
|
||||
// Define table boundaries
|
||||
CYG_HAL_TABLE_BEGIN(__NETDEVTAB__, netdev);
|
||||
@ -49,7 +50,7 @@ pppMyCallback(void *a , int e)
|
||||
|
||||
/* These temporarily here */
|
||||
unsigned long
|
||||
ppp_jiffies(void)
|
||||
sys_jiffies(void)
|
||||
{
|
||||
return cyg_current_time();
|
||||
}
|
||||
@ -87,7 +88,7 @@ void lwip_init(void)
|
||||
#if PAP_SUPPORT || CHAP_SUPPORT
|
||||
pppSetAuth("ecos", "picula");
|
||||
#endif
|
||||
pppOpen(0, pppMyCallback, NULL);
|
||||
pppOpen(sio_open(2), pppMyCallback, NULL);
|
||||
#else
|
||||
ecosglue_init();
|
||||
#endif
|
||||
@ -115,6 +116,7 @@ void lwip_dsr_stuff(void)
|
||||
{
|
||||
cyg_semaphore_post(&delivery);
|
||||
}
|
||||
|
||||
//Input thread signalled by DSR calls deliver() on low level drivers
|
||||
static void
|
||||
input_thread(void *arg)
|
||||
@ -127,7 +129,15 @@ input_thread(void *arg)
|
||||
for (t = &__NETDEVTAB__[0]; t != &__NETDEVTAB_END__; t++) {
|
||||
struct eth_drv_sc *sc = (struct eth_drv_sc *)t->device_instance;
|
||||
if (sc->state & ETH_DRV_NEEDS_DELIVERY) {
|
||||
#if defined(CYGDBG_HAL_DEBUG_GDB_CTRLC_SUPPORT)
|
||||
cyg_bool was_ctrlc_int;
|
||||
#endif
|
||||
sc->state &= ~ETH_DRV_NEEDS_DELIVERY;
|
||||
#if defined(CYGDBG_HAL_DEBUG_GDB_CTRLC_SUPPORT)
|
||||
was_ctrlc_int = HAL_CTRLC_CHECK((*sc->funs->int_vector)(sc), (int)sc);
|
||||
if (!was_ctrlc_int) // Fall through and run normal code
|
||||
|
||||
#endif
|
||||
(sc->funs->deliver) (sc);
|
||||
}
|
||||
}
|
||||
@ -163,7 +173,7 @@ static void
|
||||
ecosglue_init(void)
|
||||
{
|
||||
init_hw_drivers();
|
||||
sys_thread_new(input_thread, (void*)0,7);
|
||||
sys_thread_new(input_thread, (void*)0, 6);
|
||||
etharp_init();
|
||||
sys_timeout(ARP_TMR_INTERVAL, (sys_timeout_handler) arp_timer, NULL);
|
||||
}
|
||||
|
@ -64,3 +64,8 @@ sio_open(int devnum)
|
||||
return &ser;
|
||||
}
|
||||
|
||||
void
|
||||
sio_read_abort(void * dev)
|
||||
{
|
||||
diag_printf("Abort called\n");
|
||||
}
|
||||
|
@ -738,7 +738,7 @@ void
|
||||
tmain(void * p)
|
||||
{
|
||||
lwip_init();
|
||||
sys_thread_new(net_test, 0,7);
|
||||
sys_thread_new(net_test, 0, MAIN_THREAD_PRIORITY);
|
||||
}
|
||||
|
||||
static char stack[STACK_SIZE];
|
||||
|
@ -55,7 +55,6 @@ src/netif/ppp/chpms.c src/netif/ppp/chpms.c
|
||||
src/netif/ppp/pap.c src/netif/ppp/pap.c
|
||||
src/netif/ppp/magic.c src/netif/ppp/magic.c
|
||||
src/netif/ppp/md5.c src/netif/ppp/md5.c
|
||||
src/netif/ppp/target.c src/netif/ppp/target.c
|
||||
src/netif/ppp/fsm.c src/netif/ppp/fsm.c
|
||||
src/netif/ppp/ipcp.c src/netif/ppp/ipcp.c
|
||||
src/netif/ppp/lcp.c src/netif/ppp/lcp.c
|
||||
@ -69,7 +68,6 @@ src/netif/ppp/chpms.h src/netif/ppp/chpms.h
|
||||
src/netif/ppp/pap.h src/netif/ppp/pap.h
|
||||
src/netif/ppp/magic.h src/netif/ppp/magic.h
|
||||
src/netif/ppp/md5.h src/netif/ppp/md5.h
|
||||
src/netif/ppp/target.h src/netif/ppp/target.h
|
||||
src/netif/ppp/fsm.h src/netif/ppp/fsm.h
|
||||
src/netif/ppp/ipcp.h src/netif/ppp/ipcp.h
|
||||
src/netif/ppp/lcp.h src/netif/ppp/lcp.h
|
||||
|
Loading…
Reference in New Issue
Block a user