diff --git a/drivers/netchar/netchar.c b/drivers/netchar/netchar.c index 3a0b2aac..13ac0d6d 100755 --- a/drivers/netchar/netchar.c +++ b/drivers/netchar/netchar.c @@ -24,7 +24,7 @@ #include #include -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET #include #include #include @@ -36,36 +36,36 @@ #include #include #include -#endif +//#endif + /* Implementation of a simple stdout device */ static ssize_t netchar_read(fildes_t* file, uint8_t* buffer, size_t size) { - kprintf("\nlwip_read: %p with lenght %i and Socket %i", buffer, size, file->offset); + //kprintf("\nlwip_read: %p with lenght %i and Socket %i", buffer, size, file->offset); int ret; -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET ret = lwip_read((int)file->offset, buffer, size); if (ret < 0) ret = -errno; -#else - ret = -EINVAL; -#endif +//#else +//#endif + kprintf("return size: %i", ret); return ret; } static ssize_t netchar_write(fildes_t* file, uint8_t* buffer, size_t size) { int ret; -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET ret = lwip_write(file->offset, buffer, size); if (ret < 0) ret = -errno; -#else - ret = -EINVAL; -#endif +//#else +//#endif return ret; } @@ -77,13 +77,13 @@ static int netchar_open(fildes_t* file, const char* name) static int netchar_close(vfs_node_t* node) //////////////change this in File!!! { int ret; -#if defined(CONFIG_LWIP) && LWIP_SOCKET - ret = lwip_close(file->offset); +//#if defined(CONFIG_LWIP) && LWIP_SOCKET +// ret = lwip_close(file->offset); if (ret < 0) ret = -errno; -#else +//#else ret = 0; -#endif +//#endif return ret; } diff --git a/kernel/syscall.c b/kernel/syscall.c index 611faa07..57b49a88 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -27,7 +27,7 @@ #include #include -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET #include #include #include @@ -40,7 +40,7 @@ #include #include -#endif +//#endif static int sys_open(const char* name, int flags, int mode) { @@ -69,7 +69,7 @@ static int sys_open(const char* name, int flags, int mode) return fd; } -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET static int sys_socket(int domain, int type, int protocol) { int fd; @@ -114,7 +114,7 @@ static int sys_accept(int s, struct sockaddr* addr, socklen_t* addrlen) return fd; } -#endif +//#endif static int sys_close(int fd) @@ -275,7 +275,7 @@ int syscall_handler(uint32_t sys_nr, ...) ret = sys_times(buffer, clock); break; } -#if defined(CONFIG_LWIP) && LWIP_SOCKET +//#if defined(CONFIG_LWIP) && LWIP_SOCKET case __NR_closesocket: { int fd = va_arg(vl, int); @@ -306,7 +306,7 @@ int syscall_handler(uint32_t sys_nr, ...) ret = -ENOTSOCK; break; } - kprintf("lwip_connect: %p with lenght %i and Socket %i", name, namelen, per_core(current_task)->fildes_table[fd].offset); + //kprintf("lwip_connect: %p with lenght %i and Socket %i", name, namelen, per_core(current_task)->fildes_table[fd].offset); ret = lwip_connect(per_core(current_task)->fildes_table[fd].offset, name, namelen); @@ -356,7 +356,7 @@ int syscall_handler(uint32_t sys_nr, ...) ret = -errno; break; } -#endif +//#endif default: kputs("invalid system call\n"); ret = -ENOSYS;