From 7c10065bd27c2aec81548eed2b9e45e96ba2802c Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Sat, 13 Oct 2018 16:26:25 +0200 Subject: [PATCH] Revert "Try to implement platform-independent keypressed()" This reverts commit a0d7b01186ffaba8369d2b5f2e50275ae03af96b. The new 'keypressed()' wasn't platform-independent but broke the win32 port. Signed-off-by: Simon Goldschmidt --- contrib/examples/example_app/test.c | 26 ++++------ contrib/ports/win32/include/arch/sys_arch.h | 32 ++++++------ contrib/ports/win32/sys_arch.c | 54 +++++++++++++++------ 3 files changed, 66 insertions(+), 46 deletions(-) diff --git a/contrib/examples/example_app/test.c b/contrib/examples/example_app/test.c index adf67dec..ce34bdd2 100644 --- a/contrib/examples/example_app/test.c +++ b/contrib/examples/example_app/test.c @@ -1,11 +1,11 @@ /* * Copyright (c) 2001,2002 Florian Schulze. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -14,7 +14,7 @@ * 3. Neither the name of the authors nor the names of the contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -86,16 +86,6 @@ #include "default_netif.h" -static u8_t -keypressed(void) -{ - struct timeval tv = { 0L, 0L }; - fd_set fds; - FD_ZERO(&fds); - FD_SET(0, &fds); - return select(1, &fds, NULL, NULL, &tv); -} - #if NO_SYS /* ... then we need information about the timer intervals: */ #include "lwip/ip4_frag.h" @@ -117,6 +107,10 @@ keypressed(void) /* include the port-dependent configuration */ #include "lwipcfg.h" +#ifndef LWIP_EXAMPLE_APP_ABORT +#define LWIP_EXAMPLE_APP_ABORT() 0 +#endif + /** Define this to 1 to enable a port-specific ethernet interface as default interface. */ #ifndef USE_DEFAULT_ETH_NETIF #define USE_DEFAULT_ETH_NETIF 1 @@ -375,7 +369,7 @@ test_netif_init(void) #endif #if LWIP_IPV6 netif_create_ip6_linklocal_address(netif_default, 1); -#if LWIP_IPV6_AUTOCONFIG +#if LWIP_IPV6_AUTOCONFIG netif_default->ip6_autoconfig_enabled = 1; #endif printf("ip6 linklocal address: %s\n", ip6addr_ntoa(netif_ip6_addr(netif_default, 0))); @@ -496,7 +490,7 @@ dns_dorequest(void *arg) const char* dnsname = "3com.com"; ip_addr_t dnsresp; LWIP_UNUSED_ARG(arg); - + if (dns_gethostbyname(dnsname, &dnsresp, dns_found, 0) == ERR_OK) { dns_found(dnsname, &dnsresp, 0); } @@ -663,7 +657,7 @@ main_loop(void) #endif /* MAIN LOOP for driver update (and timers if NO_SYS) */ - while (!keypressed()) { + while (!LWIP_EXAMPLE_APP_ABORT()) { #if NO_SYS /* handle timers (already done in tcpip.c when NO_SYS=0) */ sys_check_timeouts(); diff --git a/contrib/ports/win32/include/arch/sys_arch.h b/contrib/ports/win32/include/arch/sys_arch.h index 17add9ea..f56c9df2 100644 --- a/contrib/ports/win32/include/arch/sys_arch.h +++ b/contrib/ports/win32/include/arch/sys_arch.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -74,4 +74,8 @@ void sys_arch_netconn_sem_free(void); #define LWIP_NETCONN_THREAD_SEM_ALLOC() sys_arch_netconn_sem_alloc() #define LWIP_NETCONN_THREAD_SEM_FREE() sys_arch_netconn_sem_free() +#define LWIP_EXAMPLE_APP_ABORT() lwip_win32_keypressed() +int lwip_win32_keypressed(void); + #endif /* LWIP_ARCH_SYS_ARCH_H */ + diff --git a/contrib/ports/win32/sys_arch.c b/contrib/ports/win32/sys_arch.c index fb3559e4..84232d5b 100644 --- a/contrib/ports/win32/sys_arch.c +++ b/contrib/ports/win32/sys_arch.c @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * Simon Goldschmidt * @@ -248,7 +248,7 @@ sys_sem_new(sys_sem_t *sem, u8_t count) sem->sem = new_sem; return ERR_OK; } - + /* failed to allocate memory... */ if (SYS_INITIALIZED()) { SYS_ARCH_LOCKED(SYS_STATS_INC(sem.err)); @@ -336,7 +336,7 @@ sys_mutex_new(sys_mutex_t *mutex) mutex->mut = new_mut; return ERR_OK; } - + /* failed to allocate memory... */ SYS_ARCH_LOCKED(SYS_STATS_INC(mutex.err)); mutex->mut = NULL; @@ -732,6 +732,28 @@ sys_arch_netconn_sem_free(void) #endif /* !NO_SYS */ +/* get keyboard state to terminate the debug app on any kbhit event using win32 API */ +int +lwip_win32_keypressed(void) +{ + INPUT_RECORD rec; + DWORD num = 0; + HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + BOOL ret = PeekConsoleInput(h, &rec, 1, &num); + if (ret && num) { + ReadConsoleInput(h, &rec, 1, &num); + if (rec.EventType == KEY_EVENT) { + if (rec.Event.KeyEvent.bKeyDown) { + /* not a special key? */ + if (rec.Event.KeyEvent.uChar.AsciiChar != 0) { + return 1; + } + } + } + } + return 0; +} + #include /* This is an example implementation for LWIP_PLATFORM_DIAG: