Index: HelenOS.config =================================================================== --- HelenOS.config (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ HelenOS.config (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -578,6 +578,6 @@ # USB settings -% USB release build (less logging) -! CONFIG_USB_RELEASE_BUILD (y/n) +% USB verbose messages +! CONFIG_USB_VERBOSE (n/y) % Start virtual USB host controller Index: uspace/lib/usb/include/usb/debug.h =================================================================== --- uspace/lib/usb/include/usb/debug.h (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/lib/usb/include/usb/debug.h (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -81,8 +81,8 @@ /** Default log level. */ -#ifdef CONFIG_USB_RELEASE_BUILD +#ifdef CONFIG_USB_VERBOSE +# define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG +#else # define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO -#else -# define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG #endif Index: pace/srv/hid/input/include/sun.h =================================================================== --- uspace/srv/hid/input/include/sun.h (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * 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 OF SUCH DAMAGE. - */ - -/** @addtogroup kbdgen generic - * @brief Sun keyboard virtual port driver. - * @ingroup kbd - * @{ - */ -/** @file - */ - -#ifndef KBD_SUN_H_ -#define KBD_SUN_H_ - -extern int ns16550_port_init(void); -extern int z8530_port_init(void); - -#endif - -/** - * @} - */ Index: pace/srv/hid/input/port/dummy.c =================================================================== --- uspace/srv/hid/input/port/dummy.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2009 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * 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 OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @brief Dummy keyboard port driver. - * @ingroup kbd - * @{ - */ -/** @file - */ - -#include -#include - -int kbd_port_init(void) -{ - return 0; -} - -void kbd_port_yield(void) -{ -} - -void kbd_port_reclaim(void) -{ -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** @} -*/ Index: pace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ (revision ) @@ -1,188 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * 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 OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief SGCN (Serengeti Console) keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define POLL_INTERVAL 10000 - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[4]; - - /** we don't need this */ - char unused[8]; - - /** offset within the SGCN buffer of the input buffer start */ - uint32_t in_begin; - - /** offset within the SGCN buffer of the input buffer end */ - uint32_t in_end; - - /** offset within the SGCN buffer of the input buffer read pointer */ - uint32_t in_rdptr; - - /** offset within the SGCN buffer of the input buffer write pointer */ - uint32_t in_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (sram_virt_addr + sram_buffer_offset + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -/** - * Virtual address mapped to SRAM. - */ -static uintptr_t sram_virt_addr; - -/** - * SGCN buffer offset within SGCN. - */ -static uintptr_t sram_buffer_offset; - -/* polling thread */ -static void sgcn_thread_impl(void *arg); - -static volatile bool polling_disabled = false; - -/** - * Initializes the SGCN driver. - * Maps the physical memory (SRAM) and creates the polling thread. - */ -int kbd_port_init(void) -{ - sysarg_t sram_paddr; - if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK) - return -1; - - sysarg_t sram_size; - if (sysinfo_get_value("sram.area.size", &sram_size) != EOK) - return -1; - - if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK) - sram_buffer_offset = 0; - - sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size); - - if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr, - sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) { - printf("SGCN: uspace driver could not map physical memory."); - return -1; - } - - thread_id_t tid; - int rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid); - if (rc != 0) - return rc; - - return 0; -} - -void kbd_port_yield(void) -{ - polling_disabled = true; -} - -void kbd_port_reclaim(void) -{ - polling_disabled = false; -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** - * Handler of the "key pressed" event. Reads codes of all the pressed keys from - * the buffer. - */ -static void sgcn_key_pressed(void) -{ - char c; - - uint32_t begin = SGCN_BUFFER_HEADER->in_begin; - uint32_t end = SGCN_BUFFER_HEADER->in_end; - uint32_t size = end - begin; - - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr); - volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr); - - while (*in_rdptr_ptr != *in_wrptr_ptr) { - c = *buf_ptr; - *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; - buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - kbd_push_scancode(c); - } -} - -/** - * Thread to poll SGCN for keypresses. - */ -static void sgcn_thread_impl(void *arg) -{ - (void) arg; - - while (1) { - if (polling_disabled == false) - sgcn_key_pressed(); - usleep(POLL_INTERVAL); - } -} - -/** @} - */ Index: pace/srv/hid/input/port/sun.c =================================================================== --- uspace/srv/hid/input/port/sun.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ (revision ) @@ -1,89 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * 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 OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief Sun keyboard virtual port driver. - */ - -#include -#include -#include -#include -#include -#include - -/** Sun keyboard virtual port driver. - * - * This is a virtual port driver which can use - * both ns16550_port_init and z8530_port_init - * according to the information passed from the - * kernel. This is just a temporal hack. - * - */ -int kbd_port_init(void) -{ - sysarg_t z8530; - if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK) - z8530 = false; - - sysarg_t ns16550; - if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK) - ns16550 = false; - - if (z8530) { - if (z8530_port_init() == 0) - return 0; - } - - if (ns16550) { - if (ns16550_port_init() == 0) - return 0; - } - - return -1; -} - -void kbd_port_yield(void) -{ -} - -void kbd_port_reclaim(void) -{ -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** @} -*/ Index: pace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ (revision ) @@ -1,116 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * 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 OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief Z8530 keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define CHAN_A_STATUS 4 -#define CHAN_A_DATA 6 - -#define RR0_RCA 1 - -static irq_cmd_t z8530_cmds[] = { - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 1 - }, - { - .cmd = CMD_BTEST, - .value = RR0_RCA, - .srcarg = 1, - .dstarg = 3 - }, - { - .cmd = CMD_PREDICATE, - .value = 2, - .srcarg = 3 - }, - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 2 - }, - { - .cmd = CMD_ACCEPT - } -}; - -irq_code_t z8530_kbd = { - sizeof(z8530_cmds) / sizeof(irq_cmd_t), - z8530_cmds -}; - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); - -int z8530_port_init(void) -{ - sysarg_t kaddr; - if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK) - return -1; - - sysarg_t inr; - if (sysinfo_get_value("kbd.inr", &inr) != EOK) - return -1; - - z8530_cmds[0].addr = (void *) kaddr + CHAN_A_STATUS; - z8530_cmds[3].addr = (void *) kaddr + CHAN_A_DATA; - - async_set_interrupt_received(z8530_irq_handler); - register_irq(inr, device_assign_devno(), inr, &z8530_kbd); - - return 0; -} - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - int scan_code = IPC_GET_ARG2(*call); - kbd_push_scancode(scan_code); - - if (irc_service) - async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, - IPC_GET_IMETHOD(*call)); -} - -/** @} - */ Index: uspace/srv/net/tcp/ncsim.c =================================================================== --- uspace/srv/net/tcp/ncsim.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/ncsim.c (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -44,5 +44,5 @@ #include #include -#include +#include #include "conn.h" #include "ncsim.h" @@ -119,6 +119,6 @@ } -/** Network condition simulator handler thread. */ -static void tcp_ncsim_thread(void *arg) +/** Network condition simulator handler fibril. */ +static int tcp_ncsim_fibril(void *arg) { link_t *link; @@ -126,5 +126,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_ncsim_thread()"); + log_msg(LVL_DEBUG, "tcp_ncsim_fibril()"); @@ -151,19 +151,23 @@ free(sqe); } + + /* Not reached */ + return 0; } -/** Start simulator handler thread. */ -void tcp_ncsim_thread_start(void) +/** Start simulator handler fibril. */ +void tcp_ncsim_fibril_start(void) { - thread_id_t tid; - int rc; + fid_t fid; - log_msg(LVL_DEBUG, "tcp_ncsim_thread_start()"); + log_msg(LVL_DEBUG, "tcp_ncsim_fibril_start()"); - rc = thread_create(tcp_ncsim_thread, NULL, "ncsim", &tid); - if (rc != EOK) { - log_msg(LVL_ERROR, "Failed creating ncsim thread."); + fid = fibril_create(tcp_ncsim_fibril, NULL); + if (fid == 0) { + log_msg(LVL_ERROR, "Failed creating ncsim fibril."); return; } + + fibril_add_ready(fid); } Index: uspace/srv/net/tcp/ncsim.h =================================================================== --- uspace/srv/net/tcp/ncsim.h (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/ncsim.h (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -40,6 +40,5 @@ extern void tcp_ncsim_init(void); extern void tcp_ncsim_bounce_seg(tcp_sockpair_t *, tcp_segment_t *); -extern void tcp_ncsim_thread_start(void); - +extern void tcp_ncsim_fibril_start(void); #endif Index: uspace/srv/net/tcp/rqueue.c =================================================================== --- uspace/srv/net/tcp/rqueue.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/rqueue.c (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -39,5 +39,5 @@ #include #include -#include +#include #include "conn.h" #include "pdu.h" @@ -128,11 +128,11 @@ } -/** Receive queue handler thread. */ -static void tcp_rqueue_thread(void *arg) +/** Receive queue handler fibril. */ +static int tcp_rqueue_fibril(void *arg) { link_t *link; tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_thread()"); + log_msg(LVL_DEBUG, "tcp_rqueue_fibril()"); while (true) { @@ -142,19 +142,23 @@ tcp_as_segment_arrived(&rqe->sp, rqe->seg); } + + /* Not reached */ + return 0; } -/** Start receive queue handler thread. */ -void tcp_rqueue_thread_start(void) +/** Start receive queue handler fibril. */ +void tcp_rqueue_fibril_start(void) { - thread_id_t tid; - int rc; + fid_t fid; - log_msg(LVL_DEBUG, "tcp_rqueue_thread_start()"); + log_msg(LVL_DEBUG, "tcp_rqueue_fibril_start()"); - rc = thread_create(tcp_rqueue_thread, NULL, "rqueue", &tid); - if (rc != EOK) { - log_msg(LVL_ERROR, "Failed creating rqueue thread."); + fid = fibril_create(tcp_rqueue_fibril, NULL); + if (fid == 0) { + log_msg(LVL_ERROR, "Failed creating rqueue fibril."); return; } + + fibril_add_ready(fid); } Index: uspace/srv/net/tcp/rqueue.h =================================================================== --- uspace/srv/net/tcp/rqueue.h (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/rqueue.h (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -42,5 +42,5 @@ extern void tcp_rqueue_insert_seg(tcp_sockpair_t *, tcp_segment_t *); extern void tcp_rqueue_handler(void *); -extern void tcp_rqueue_thread_start(void); +extern void tcp_rqueue_fibril_start(void); Index: uspace/srv/net/tcp/tcp.c =================================================================== --- uspace/srv/net/tcp/tcp.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/tcp.c (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -180,8 +180,8 @@ tcp_rqueue_init(); - tcp_rqueue_thread_start(); + tcp_rqueue_fibril_start(); tcp_ncsim_init(); - tcp_ncsim_thread_start(); + tcp_ncsim_fibril_start(); if (0) tcp_test(); Index: uspace/srv/net/tcp/test.c =================================================================== --- uspace/srv/net/tcp/test.c (revision 8d2d308fb498f32d36e15114a75008800742cc19) +++ uspace/srv/net/tcp/test.c (revision 8264867016dcb0b1fbb2065b1672d6a538de8e11) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include "tcp_type.h" @@ -47,5 +47,5 @@ #define RCV_BUF_SIZE 64 -static void test_srv(void *arg) +static int test_srv(void *arg) { tcp_conn_t *conn; @@ -84,7 +84,8 @@ printf("test_srv() terminating\n"); + return 0; } -static void test_cli(void *arg) +static int test_cli(void *arg) { tcp_conn_t *conn; @@ -112,11 +113,12 @@ printf("C: User close...\n"); tcp_uc_close(conn); + + return 0; } void tcp_test(void) { - thread_id_t srv_tid; - thread_id_t cli_tid; - int rc; + fid_t srv_fid; + fid_t cli_fid; printf("tcp_test()\n"); @@ -125,17 +127,21 @@ if (0) { - rc = thread_create(test_srv, NULL, "test_srv", &srv_tid); - if (rc != EOK) { - printf("Failed to create server thread.\n"); + srv_fid = fibril_create(test_srv, NULL); + if (srv_fid == 0) { + printf("Failed to create server fibril.\n"); return; } + + fibril_add_ready(srv_fid); } if (0) { - rc = thread_create(test_cli, NULL, "test_cli", &cli_tid); - if (rc != EOK) { - printf("Failed to create client thread.\n"); + cli_fid = fibril_create(test_cli, NULL); + if (cli_fid == 0) { + printf("Failed to create client fibril.\n"); return; } + + fibril_add_ready(cli_fid); } }