Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ uspace/srv/devman/devman.c (revision 358dc1347a4e02901e65024ae462b98ca9d14566) @@ -270,7 +270,8 @@ } - ssize_t read_bytes = safe_read(fd, buf, len); + ssize_t read_bytes = read_all(fd, buf, len); if (read_bytes <= 0) { - log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); + log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path, + read_bytes); goto cleanup; } @@ -421,7 +422,7 @@ } - insert_fun_node(tree, fun, clone_string(""), NULL); + insert_fun_node(tree, fun, str_dup(""), NULL); match_id_t *id = create_match_id(); - id->id = clone_string("root"); + id->id = str_dup("root"); id->score = 100; add_match_id(&fun->match_ids, id); Index: uspace/srv/devman/util.c =================================================================== --- uspace/srv/devman/util.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ uspace/srv/devman/util.c (revision 358dc1347a4e02901e65024ae462b98ca9d14566) @@ -91,15 +91,4 @@ } -char *clone_string(const char *s) -{ - size_t size = str_size(s) + 1; - char *str; - - str = (char *) malloc(size); - if (str != NULL) - str_cpy(str, size, s); - return str; -} - void replace_char(char *str, char orig, char repl) { @@ -111,31 +100,4 @@ } -ssize_t safe_read(int fd, void *buffer, size_t size) -{ - if (size == 0) { - return 0; - } - - uint8_t *buf_ptr = (uint8_t *) buffer; - - size_t total_read = 0; - while (total_read < size) { - ssize_t bytes_read = read(fd, buf_ptr, size - total_read); - if (bytes_read < 0) { - /* Error. */ - return bytes_read; - } else if (bytes_read == 0) { - /* Possibly end of file. */ - break; - } else { - /* Read at least something. */ - buf_ptr += bytes_read; - total_read += bytes_read; - } - } - - return (ssize_t) total_read; -} - /** @} */ Index: uspace/srv/devman/util.h =================================================================== --- uspace/srv/devman/util.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ uspace/srv/devman/util.h (revision 358dc1347a4e02901e65024ae462b98ca9d14566) @@ -44,8 +44,5 @@ extern size_t get_nonspace_len(const char *); extern void free_not_null(const void *); -extern char *clone_string(const char *); extern void replace_char(char *, char, char); - -extern ssize_t safe_read(int, void *, size_t); #endif Index: uspace/srv/hid/input/include/sun.h =================================================================== --- uspace/srv/hid/input/include/sun.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (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: uspace/srv/hid/input/port/dummy.c =================================================================== --- uspace/srv/hid/input/port/dummy.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (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: uspace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (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: uspace/srv/hid/input/port/sun.c =================================================================== --- uspace/srv/hid/input/port/sun.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (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: uspace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (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/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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 i8042 port driver. - */ - -#ifndef KBD_PORT_i8042_H_ -#define KBD_PORT_i8042_H_ - -#include -#include - -struct i8042 { - ioport8_t data; - uint8_t pad[3]; - ioport8_t status; -} __attribute__ ((packed)); -typedef struct i8042 i8042_t; - -#endif - -/** - * @} - */ Index: uspace/srv/hw/netif/ne2000/dp8390_drv.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_drv.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,84 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 dp8390 - * @{ - */ - -/** @file - * DP8390 network interface driver interface. - */ - -#ifndef __NET_NETIF_DP8390_DRIVER_H__ -#define __NET_NETIF_DP8390_DRIVER_H__ - -#include "dp8390.h" - -/** Initializes and/or starts the network interface. - * @param[in,out] dep The network interface structure. - * @param[in] mode The state mode. - * @returns EOK on success. - * @returns EXDEV if the network interface is disabled. - */ -int do_init(dpeth_t *dep, int mode); - -/** Stops the network interface. - * @param[in,out] dep The network interface structure. - */ -void do_stop(dpeth_t *dep); - -/** Processes the interrupt. - * @param[in,out] dep The network interface structure. - * @param[in] isr The interrupt status register. - */ -void dp_check_ints(dpeth_t *dep, int isr); - -/** Probes and initializes the network interface. - * @param[in,out] dep The network interface structure. - * @returns EOK on success. - * @returns EXDEV if the network interface was not recognized. - */ -int do_probe(dpeth_t * dep); - -/** Sends a packet. - * @param[in,out] dep The network interface structure. - * @param[in] packet The packet t be sent. - * @param[in] from_int The value indicating whether the sending is initialized from the interrupt handler. - * @returns - */ -int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int); - -/** Prints out network interface information. - * @param[in] dep The network interface structure. - */ -void dp8390_dump(dpeth_t * dep); - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/dp8390_port.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_port.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,274 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 dp8390 - * @{ - */ - -/** @file - * DP8390 network interface types and structures ports. - */ - -#ifndef __NET_NETIF_DP8390_PORT_H__ -#define __NET_NETIF_DP8390_PORT_H__ - -#include -#include -#include -#include -#include - -/** Macro for difining functions. - * @param[in] function The function type and name definition. - * @param[in] params The function parameters definition. - */ -#define _PROTOTYPE(function, params) function params - -/** Success error code. - */ -#define OK EOK - -/** Type definition of the unsigned byte. - */ -typedef uint8_t u8_t; - -/** Type definition of the unsigned short. - */ -typedef uint16_t u16_t; - -/** Compares two memory blocks. - * @param[in] first The first memory block. - * @param[in] second The second memory block. - * @param[in] size The blocks size in bytes. - * @returns 0 if equeal. - * @returns -1 if the first is greater than the second. - * @returns 1 if the second is greater than the first. - */ -#define memcmp(first, second, size) bcmp((char *) (first), (char *) (second), (size)) - -/** Reads 1 byte. - * @param[in] port The address to be read. - * @returns The read value. - */ -#define inb(port) pio_read_8((ioport8_t *) (port)) - -/** Reads 1 word (2 bytes). - * @param[in] port The address to be read. - * @returns The read value. - */ -#define inw(port) pio_read_16((ioport16_t *) (port)) - -/** Writes 1 byte. - * @param[in] port The address to be written. - * @param[in] value The value to be written. - */ -#define outb(port, value) pio_write_8((ioport8_t *) (port), (value)) - -/** Writes 1 word (2 bytes). - * @param[in] port The address to be written. - * @param[in] value The value to be written. - */ -#define outw(port, value) pio_write_16((ioport16_t *) (port), (value)) - -/** Prints out the driver critical error. - * Does not call the system panic(). - */ -#define panic(...) printf("%s%s%d", __VA_ARGS__) - -/** Copies a memory block. - * @param proc The source process. Ignored parameter. - * @param src_s Ignored parameter. - * @param[in] src The source address. - * @param me The current proces. Ignored parameter. - * @param dst_s Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - * @returns EOK. - */ -#define sys_vircopy(proc, src_s, src, me, dst_s, dst, bytes) ({memcpy((void *)(dst), (void *)(src), (bytes)); EOK;}) - -/** Reads a memory block byte by byte. - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_insb(port, proc, dst, bytes) insb((port), (void *)(dst), (bytes)) - -/** Reads a memory block word by word (2 bytes). - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_insw(port, proc, dst, bytes) insw((port), (void *)(dst), (bytes)) - -/** Writes a memory block byte by byte. - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] src The source address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_outsb(port, proc, src, bytes) outsb((port), (void *)(src), (bytes)) - -/** Writes a memory block word by word (2 bytes). - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] src The source address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_outsw(port, proc, src, bytes) outsw((port), (void *)(src), (bytes)) - -/* com.h */ -/* Bits in 'DL_MODE' field of DL requests. */ -# define DL_NOMODE 0x0 -# define DL_PROMISC_REQ 0x2 -# define DL_MULTI_REQ 0x4 -# define DL_BROAD_REQ 0x8 - -/* const.h */ -/** True value. - */ -#define TRUE 1 /* used for turning integers into Booleans */ - -/** False value. - */ -#define FALSE 0 /* used for turning integers into Booleans */ - -/** No number value. - */ -#define NO_NUM 0x8000 /* used as numerical argument to panic() */ - -/* devio.h */ -//typedef u16_t port_t; -/** Type definition of a port. - */ -typedef long port_t; - -/* dl_eth.h */ -/** Ethernet statistics. - */ -typedef struct eth_stat -{ - /** Number of receive errors. - */ - unsigned long ets_recvErr; - /** Number of send error. - */ - unsigned long ets_sendErr; - /** Number of buffer overwrite warnings. - */ - unsigned long ets_OVW; - /** Number of crc errors of read. - */ - unsigned long ets_CRCerr; - /** Number of frames not alligned (number of bits % 8 != 0). - */ - unsigned long ets_frameAll; - /** Number of packets missed due to slow processing. - */ - unsigned long ets_missedP; - /** Number of packets received. - */ - unsigned long ets_packetR; - /** Number of packets transmitted. - */ - unsigned long ets_packetT; - /** Number of transmission defered (Tx was busy). - */ - unsigned long ets_transDef; - /** Number of collissions. - */ - unsigned long ets_collision; - /** Number of Tx aborted due to excess collisions. - */ - unsigned long ets_transAb; - /** Number of carrier sense lost. - */ - unsigned long ets_carrSense; - /** Number of FIFO underruns (processor too busy). - */ - unsigned long ets_fifoUnder; - /** Number of FIFO overruns (processor too busy). - */ - unsigned long ets_fifoOver; - /** Number of times unable to transmit collision sig. - */ - unsigned long ets_CDheartbeat; - /** Number of times out of window collision. - */ - unsigned long ets_OWC; -} eth_stat_t; - -/* errno.h */ -/** Generic error. - */ -#define EGENERIC EINVAL - -/* ether.h */ -/** Minimum Ethernet packet size in bytes. - */ -#define ETH_MIN_PACK_SIZE 60 - -/** Maximum Ethernet packet size in bytes. - */ -#define ETH_MAX_PACK_SIZE_TAGGED 1518 - -/** Ethernet address type definition. - */ -typedef struct ether_addr -{ - /** Address data. - */ - u8_t ea_addr[6]; -} ether_addr_t; - -/* type.h */ -/** Type definition of the physical addresses and lengths in bytes. - */ -typedef unsigned long phys_bytes; - -/** Type definition of the virtual addresses and lengths in bytes. - */ -typedef unsigned long vir_bytes; - -/** Type definition of the input/output vector. - */ -typedef struct { - /** Address of an I/O buffer. - */ - vir_bytes iov_addr; - /** Sizeof an I/O buffer. - */ - vir_bytes iov_size; -} iovec_t; - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/local.h =================================================================== --- uspace/srv/hw/netif/ne2000/local.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, 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 ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - -/** @addtogroup dp8390 - * @{ - */ - -/** @file - * Network interface probe functions. - */ - -#ifndef __NET_NETIF_DP8390_CONFIG_H__ -#define __NET_NETIF_DP8390_CONFIG_H__ - -#include "dp8390_port.h" - -/* -local.h -*/ - -/** WDETH switch. - */ -#define ENABLE_WDETH 0 - -/** NE2000 switch. - */ -#define ENABLE_NE2000 1 - -/** 3C503 switch. - */ -#define ENABLE_3C503 0 - -/** PCI support switch. - */ -#define ENABLE_PCI 0 - -struct dpeth; - -/* 3c503.c */ -/* * Probes a 3C503 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int el2_probe, (struct dpeth*dep) ); - -/* ne2000.c */ -/** Probes a NE2000 or NE1000 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -int ne_probe(struct dpeth * dep); -//_PROTOTYPE(int ne_probe, (struct dpeth *dep) ); -//_PROTOTYPE(void ne_init, (struct dpeth *dep) ); - -/* rtl8029.c */ -/* * Probes a RTL8029 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int rtl_probe, (struct dpeth *dep) ); - -/* wdeth.c */ -/* * Probes a WDETH network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int wdeth_probe, (struct dpeth*dep) ); - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/ne2000.h =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,111 +1,0 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, 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 ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - -/* -ne2000.h - -Created: March 15, 1994 by Philip Homburg -*/ - -/** @addtogroup ne2k - * @{ - */ - -/** @file - * NE1000 and NE2000 network interface definitions. - */ - -#ifndef __NET_NETIF_NE2000_H__ -#define __NET_NETIF_NE2000_H__ - -#include - -#include "dp8390_port.h" - -/** DP8390 register offset. - */ -#define NE_DP8390 0x00 - -/** Data register. - */ -#define NE_DATA 0x10 - -/** Reset register. - */ -#define NE_RESET 0x1F - -/** NE1000 data start. - */ -#define NE1000_START 0x2000 - -/** NE1000 data size. - */ -#define NE1000_SIZE 0x2000 - -/** NE2000 data start. - */ -#define NE2000_START 0x4000 - -/** NE2000 data size. - */ -#define NE2000_SIZE 0x4000 - -/** Reads 1 byte register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @returns The read value. - */ -#define inb_ne(dep, reg) (inb(dep->de_base_port+reg)) - -/** Writes 1 byte register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @param[in] data The value to be written. - */ -#define outb_ne(dep, reg, data) (outb(dep->de_base_port+reg, data)) - -/** Reads 1 word (2 bytes) register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @returns The read value. - */ -#define inw_ne(dep, reg) (inw(dep->de_base_port+reg)) - -/** Writes 1 word (2 bytes) register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @param[in] data The value to be written. - */ -#define outw_ne(dep, reg, data) (outw(dep->de_base_port+reg, data)) - -#endif /* __NET_NETIF_NE2000_H__ */ - -/* - * $PchId: ne2000.h,v 1.4 2004/08/03 12:03:20 philip Exp $ - */ - -/** @} - */ Index: uspace/srv/loader/Makefile =================================================================== --- uspace/srv/loader/Makefile (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ uspace/srv/loader/Makefile (revision 358dc1347a4e02901e65024ae462b98ca9d14566) @@ -39,6 +39,4 @@ LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld -EXTRA_CFLAGS = -Iinclude - BINARY = loader STATIC_ONLY = y @@ -46,5 +44,4 @@ GENERIC_SOURCES = \ main.c \ - elf_load.c \ interp.s Index: uspace/srv/loader/elf_load.c =================================================================== --- uspace/srv/loader/elf_load.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,482 +1,0 @@ -/* - * Copyright (c) 2006 Sergey Bondari - * Copyright (c) 2006 Jakub Jermar - * Copyright (c) 2011 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 generic - * @{ - */ - -/** - * @file - * @brief Userspace ELF loader. - * - * This module allows loading ELF binaries (both executables and - * shared objects) from VFS. The current implementation allocates - * anonymous memory, fills it with segment data and then adjusts - * the memory areas' flags to the final value. In the future, - * the segments will be mapped directly from the file. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "elf.h" -#include "elf_load.h" - -#define DPRINTF(...) - -static const char *error_codes[] = { - "no error", - "invalid image", - "address space error", - "incompatible image", - "unsupported image type", - "irrecoverable error" -}; - -static unsigned int elf_load(elf_ld_t *elf, size_t so_bias); -static int segment_header(elf_ld_t *elf, elf_segment_header_t *entry); -static int section_header(elf_ld_t *elf, elf_section_header_t *entry); -static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry); - -/** Read until the buffer is read in its entirety. */ -static int my_read(int fd, void *buf, size_t len) -{ - int cnt = 0; - do { - buf += cnt; - len -= cnt; - cnt = read(fd, buf, len); - } while ((cnt > 0) && ((len - cnt) > 0)); - - return cnt; -} - -/** Load ELF binary from a file. - * - * Load an ELF binary from the specified file. If the file is - * an executable program, it is loaded unbiased. If it is a shared - * object, it is loaded with the bias @a so_bias. Some information - * extracted from the binary is stored in a elf_info_t structure - * pointed to by @a info. - * - * @param file_name Path to the ELF file. - * @param so_bias Bias to use if the file is a shared object. - * @param info Pointer to a structure for storing information - * extracted from the binary. - * - * @return EOK on success or negative error code. - * - */ -int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags, - elf_info_t *info) -{ - elf_ld_t elf; - - int fd; - int rc; - - fd = open(file_name, O_RDONLY); - if (fd < 0) { - DPRINTF("failed opening file\n"); - return -1; - } - - elf.fd = fd; - elf.info = info; - elf.flags = flags; - - rc = elf_load(&elf, so_bias); - - close(fd); - - return rc; -} - -/** Create the program control block (PCB). - * - * Fills the program control block @a pcb with information from - * @a info. - * - * @param info Program info structure - * @return EOK on success or negative error code - */ -void elf_create_pcb(elf_info_t *info, pcb_t *pcb) -{ - pcb->entry = info->entry; - pcb->dynamic = info->dynamic; - pcb->rtld_runtime = NULL; -} - - -/** Load an ELF binary. - * - * The @a elf structure contains the loader state, including - * an open file, from which the binary will be loaded, - * a pointer to the @c info structure etc. - * - * @param elf Pointer to loader state buffer. - * @param so_bias Bias to use if the file is a shared object. - * @return EE_OK on success or EE_xx error code. - */ -static unsigned int elf_load(elf_ld_t *elf, size_t so_bias) -{ - elf_header_t header_buf; - elf_header_t *header = &header_buf; - int i, rc; - - rc = my_read(elf->fd, header, sizeof(elf_header_t)); - if (rc < 0) { - DPRINTF("Read error.\n"); - return EE_INVALID; - } - - elf->header = header; - - /* Identify ELF */ - if (header->e_ident[EI_MAG0] != ELFMAG0 || - header->e_ident[EI_MAG1] != ELFMAG1 || - header->e_ident[EI_MAG2] != ELFMAG2 || - header->e_ident[EI_MAG3] != ELFMAG3) { - DPRINTF("Invalid header.\n"); - return EE_INVALID; - } - - /* Identify ELF compatibility */ - if (header->e_ident[EI_DATA] != ELF_DATA_ENCODING || - header->e_machine != ELF_MACHINE || - header->e_ident[EI_VERSION] != EV_CURRENT || - header->e_version != EV_CURRENT || - header->e_ident[EI_CLASS] != ELF_CLASS) { - DPRINTF("Incompatible data/version/class.\n"); - return EE_INCOMPATIBLE; - } - - if (header->e_phentsize != sizeof(elf_segment_header_t)) { - DPRINTF("e_phentsize:%d != %d\n", header->e_phentsize, - sizeof(elf_segment_header_t)); - return EE_INCOMPATIBLE; - } - - if (header->e_shentsize != sizeof(elf_section_header_t)) { - DPRINTF("e_shentsize:%d != %d\n", header->e_shentsize, - sizeof(elf_section_header_t)); - return EE_INCOMPATIBLE; - } - - /* Check if the object type is supported. */ - if (header->e_type != ET_EXEC && header->e_type != ET_DYN) { - DPRINTF("Object type %d is not supported\n", header->e_type); - return EE_UNSUPPORTED; - } - - /* Shared objects can be loaded with a bias */ - if (header->e_type == ET_DYN) - elf->bias = so_bias; - else - elf->bias = 0; - - elf->info->interp = NULL; - elf->info->dynamic = NULL; - - /* Walk through all segment headers and process them. */ - for (i = 0; i < header->e_phnum; i++) { - elf_segment_header_t segment_hdr; - - /* Seek to start of segment header */ - lseek(elf->fd, header->e_phoff - + i * sizeof(elf_segment_header_t), SEEK_SET); - - rc = my_read(elf->fd, &segment_hdr, - sizeof(elf_segment_header_t)); - if (rc < 0) { - DPRINTF("Read error.\n"); - return EE_INVALID; - } - - rc = segment_header(elf, &segment_hdr); - if (rc != EE_OK) - return rc; - } - - DPRINTF("Parse sections.\n"); - - /* Inspect all section headers and proccess them. */ - for (i = 0; i < header->e_shnum; i++) { - elf_section_header_t section_hdr; - - /* Seek to start of section header */ - lseek(elf->fd, header->e_shoff - + i * sizeof(elf_section_header_t), SEEK_SET); - - rc = my_read(elf->fd, §ion_hdr, - sizeof(elf_section_header_t)); - if (rc < 0) { - DPRINTF("Read error.\n"); - return EE_INVALID; - } - - rc = section_header(elf, §ion_hdr); - if (rc != EE_OK) - return rc; - } - - elf->info->entry = - (entry_point_t)((uint8_t *)header->e_entry + elf->bias); - - DPRINTF("Done.\n"); - - return EE_OK; -} - -/** Print error message according to error code. - * - * @param rc Return code returned by elf_load(). - * - * @return NULL terminated description of error. - */ -const char *elf_error(unsigned int rc) -{ - assert(rc < sizeof(error_codes) / sizeof(char *)); - - return error_codes[rc]; -} - -/** Process segment header. - * - * @param entry Segment header. - * - * @return EE_OK on success, error code otherwise. - */ -static int segment_header(elf_ld_t *elf, elf_segment_header_t *entry) -{ - switch (entry->p_type) { - case PT_NULL: - case PT_PHDR: - case PT_NOTE: - break; - case PT_LOAD: - return load_segment(elf, entry); - break; - case PT_INTERP: - /* Assume silently interp == "/app/dload" */ - elf->info->interp = "/app/dload"; - break; - case PT_DYNAMIC: - /* Record pointer to dynamic section into info structure */ - elf->info->dynamic = - (void *)((uint8_t *)entry->p_vaddr + elf->bias); - DPRINTF("dynamic section found at 0x%x\n", - (uintptr_t)elf->info->dynamic); - break; - case 0x70000000: - /* FIXME: MIPS reginfo */ - break; - case PT_SHLIB: -// case PT_LOPROC: -// case PT_HIPROC: - default: - DPRINTF("Segment p_type %d unknown.\n", entry->p_type); - return EE_UNSUPPORTED; - break; - } - return EE_OK; -} - -/** Load segment described by program header entry. - * - * @param elf Loader state. - * @param entry Program header entry describing segment to be loaded. - * - * @return EE_OK on success, error code otherwise. - */ -int load_segment(elf_ld_t *elf, elf_segment_header_t *entry) -{ - void *a; - int flags = 0; - uintptr_t bias; - uintptr_t base; - void *seg_ptr; - uintptr_t seg_addr; - size_t mem_sz; - int rc; - - bias = elf->bias; - - seg_addr = entry->p_vaddr + bias; - seg_ptr = (void *) seg_addr; - - DPRINTF("Load segment at addr %p, size 0x%x\n", (void *) seg_addr, - entry->p_memsz); - - if (entry->p_align > 1) { - if ((entry->p_offset % entry->p_align) != - (seg_addr % entry->p_align)) { - DPRINTF("Align check 1 failed offset%%align=%d, " - "vaddr%%align=%d\n", - entry->p_offset % entry->p_align, - seg_addr % entry->p_align - ); - return EE_INVALID; - } - } - - /* Final flags that will be set for the memory area */ - - if (entry->p_flags & PF_X) - flags |= AS_AREA_EXEC; - if (entry->p_flags & PF_W) - flags |= AS_AREA_WRITE; - if (entry->p_flags & PF_R) - flags |= AS_AREA_READ; - flags |= AS_AREA_CACHEABLE; - - base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE); - mem_sz = entry->p_memsz + (entry->p_vaddr - base); - - DPRINTF("Map to seg_addr=%p-%p.\n", (void *) seg_addr, - (void *) (entry->p_vaddr + bias + - ALIGN_UP(entry->p_memsz, PAGE_SIZE))); - - /* - * For the course of loading, the area needs to be readable - * and writeable. - */ - a = as_area_create((uint8_t *)base + bias, mem_sz, - AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE); - if (a == (void *)(-1)) { - DPRINTF("memory mapping failed (0x%x, %d)\n", - base+bias, mem_sz); - return EE_MEMORY; - } - - DPRINTF("as_area_create(%p, %#zx, %d) -> %p\n", - (void *) (base + bias), mem_sz, flags, (void *) a); - - /* - * Load segment data - */ - rc = lseek(elf->fd, entry->p_offset, SEEK_SET); - if (rc < 0) { - printf("seek error\n"); - return EE_INVALID; - } - -/* rc = read(fd, (void *)(entry->p_vaddr + bias), entry->p_filesz); - if (rc < 0) { printf("read error\n"); return EE_INVALID; }*/ - - /* Long reads are not possible yet. Load segment piecewise. */ - - unsigned left, now; - uint8_t *dp; - - left = entry->p_filesz; - dp = seg_ptr; - - while (left > 0) { - now = 16384; - if (now > left) now = left; - - rc = my_read(elf->fd, dp, now); - - if (rc < 0) { - DPRINTF("Read error.\n"); - return EE_INVALID; - } - - left -= now; - dp += now; - } - - /* - * The caller wants to modify the segments first. He will then - * need to set the right access mode and ensure SMC coherence. - */ - if ((elf->flags & ELDF_RW) != 0) return EE_OK; - -// printf("set area flags to %d\n", flags); - rc = as_area_change_flags(seg_ptr, flags); - if (rc != 0) { - DPRINTF("Failed to set memory area flags.\n"); - return EE_MEMORY; - } - - if (flags & AS_AREA_EXEC) { - /* Enforce SMC coherence for the segment */ - if (smc_coherence(seg_ptr, entry->p_filesz)) - return EE_MEMORY; - } - - return EE_OK; -} - -/** Process section header. - * - * @param elf Loader state. - * @param entry Segment header. - * - * @return EE_OK on success, error code otherwise. - */ -static int section_header(elf_ld_t *elf, elf_section_header_t *entry) -{ - switch (entry->sh_type) { - case SHT_PROGBITS: - if (entry->sh_flags & SHF_TLS) { - /* .tdata */ - } - break; - case SHT_NOBITS: - if (entry->sh_flags & SHF_TLS) { - /* .tbss */ - } - break; - case SHT_DYNAMIC: - /* Record pointer to dynamic section into info structure */ - elf->info->dynamic = - (void *)((uint8_t *)entry->sh_addr + elf->bias); - DPRINTF("Dynamic section found at %p.\n", - (void *) elf->info->dynamic); - break; - default: - break; - } - - return EE_OK; -} - -/** @} - */ Index: uspace/srv/loader/include/elf.h =================================================================== --- uspace/srv/loader/include/elf.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,344 +1,0 @@ -/* - * Copyright (c) 2006 Sergey Bondari - * 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 generic - * @{ - */ -/** @file - */ - -#ifndef ELF_H_ -#define ELF_H_ - -#include -#include - -/** - * current ELF version - */ -#define EV_CURRENT 1 - -/** - * ELF types - */ -#define ET_NONE 0 /* No type */ -#define ET_REL 1 /* Relocatable file */ -#define ET_EXEC 2 /* Executable */ -#define ET_DYN 3 /* Shared object */ -#define ET_CORE 4 /* Core */ -#define ET_LOPROC 0xff00 /* Processor specific */ -#define ET_HIPROC 0xffff /* Processor specific */ - -/** - * ELF machine types - */ -#define EM_NO 0 /* No machine */ -#define EM_SPARC 2 /* SPARC */ -#define EM_386 3 /* i386 */ -#define EM_MIPS 8 /* MIPS RS3000 */ -#define EM_MIPS_RS3_LE 10 /* MIPS RS3000 LE */ -#define EM_PPC 20 /* PPC32 */ -#define EM_PPC64 21 /* PPC64 */ -#define EM_ARM 40 /* ARM */ -#define EM_SPARCV9 43 /* SPARC64 */ -#define EM_IA_64 50 /* IA-64 */ -#define EM_X86_64 62 /* AMD64/EMT64 */ - -/** - * ELF identification indexes - */ -#define EI_MAG0 0 -#define EI_MAG1 1 -#define EI_MAG2 2 -#define EI_MAG3 3 -#define EI_CLASS 4 /* File class */ -#define EI_DATA 5 /* Data encoding */ -#define EI_VERSION 6 /* File version */ -#define EI_OSABI 7 -#define EI_ABIVERSION 8 -#define EI_PAD 9 /* Start of padding bytes */ -#define EI_NIDENT 16 /* ELF identification table size */ - -/** - * ELF magic number - */ -#define ELFMAG0 0x7f -#define ELFMAG1 'E' -#define ELFMAG2 'L' -#define ELFMAG3 'F' - -/** - * ELF file classes - */ -#define ELFCLASSNONE 0 -#define ELFCLASS32 1 -#define ELFCLASS64 2 - -/** - * ELF data encoding types - */ -#define ELFDATANONE 0 -#define ELFDATA2LSB 1 /* Least significant byte first (little endian) */ -#define ELFDATA2MSB 2 /* Most signigicant byte first (big endian) */ - -/** - * ELF error return codes - */ -#define EE_OK 0 /* No error */ -#define EE_INVALID 1 /* Invalid ELF image */ -#define EE_MEMORY 2 /* Cannot allocate address space */ -#define EE_INCOMPATIBLE 3 /* ELF image is not compatible with current architecture */ -#define EE_UNSUPPORTED 4 /* Non-supported ELF (e.g. dynamic ELFs) */ -#define EE_IRRECOVERABLE 5 - -/** - * ELF section types - */ -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 -#define SHT_LOOS 0x60000000 -#define SHT_HIOS 0x6fffffff -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff - -/** - * ELF section flags - */ -#define SHF_WRITE 0x1 -#define SHF_ALLOC 0x2 -#define SHF_EXECINSTR 0x4 -#define SHF_TLS 0x400 -#define SHF_MASKPROC 0xf0000000 - -/** - * Symbol binding - */ -#define STB_LOCAL 0 -#define STB_GLOBAL 1 -#define STB_WEAK 2 -#define STB_LOPROC 13 -#define STB_HIPROC 15 - -/** - * Symbol types - */ -#define STT_NOTYPE 0 -#define STT_OBJECT 1 -#define STT_FUNC 2 -#define STT_SECTION 3 -#define STT_FILE 4 -#define STT_LOPROC 13 -#define STT_HIPROC 15 - -/** - * Program segment types - */ -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff - -/** - * Program segment attributes. - */ -#define PF_X 1 -#define PF_W 2 -#define PF_R 4 - -/** - * ELF data types - * - * These types are found to be identical in both 32-bit and 64-bit - * ELF object file specifications. They are the only types used - * in ELF header. - */ -typedef uint64_t elf_xword; -typedef int64_t elf_sxword; -typedef uint32_t elf_word; -typedef int32_t elf_sword; -typedef uint16_t elf_half; - -/** - * 32-bit ELF data types. - * - * These types are specific for 32-bit format. - */ -typedef uint32_t elf32_addr; -typedef uint32_t elf32_off; - -/** - * 64-bit ELF data types. - * - * These types are specific for 64-bit format. - */ -typedef uint64_t elf64_addr; -typedef uint64_t elf64_off; - -/** ELF header */ -struct elf32_header { - uint8_t e_ident[EI_NIDENT]; - elf_half e_type; - elf_half e_machine; - elf_word e_version; - elf32_addr e_entry; - elf32_off e_phoff; - elf32_off e_shoff; - elf_word e_flags; - elf_half e_ehsize; - elf_half e_phentsize; - elf_half e_phnum; - elf_half e_shentsize; - elf_half e_shnum; - elf_half e_shstrndx; -}; -struct elf64_header { - uint8_t e_ident[EI_NIDENT]; - elf_half e_type; - elf_half e_machine; - elf_word e_version; - elf64_addr e_entry; - elf64_off e_phoff; - elf64_off e_shoff; - elf_word e_flags; - elf_half e_ehsize; - elf_half e_phentsize; - elf_half e_phnum; - elf_half e_shentsize; - elf_half e_shnum; - elf_half e_shstrndx; -}; - -/* - * ELF segment header. - * Segments headers are also known as program headers. - */ -struct elf32_segment_header { - elf_word p_type; - elf32_off p_offset; - elf32_addr p_vaddr; - elf32_addr p_paddr; - elf_word p_filesz; - elf_word p_memsz; - elf_word p_flags; - elf_word p_align; -}; -struct elf64_segment_header { - elf_word p_type; - elf_word p_flags; - elf64_off p_offset; - elf64_addr p_vaddr; - elf64_addr p_paddr; - elf_xword p_filesz; - elf_xword p_memsz; - elf_xword p_align; -}; - -/* - * ELF section header - */ -struct elf32_section_header { - elf_word sh_name; - elf_word sh_type; - elf_word sh_flags; - elf32_addr sh_addr; - elf32_off sh_offset; - elf_word sh_size; - elf_word sh_link; - elf_word sh_info; - elf_word sh_addralign; - elf_word sh_entsize; -}; -struct elf64_section_header { - elf_word sh_name; - elf_word sh_type; - elf_xword sh_flags; - elf64_addr sh_addr; - elf64_off sh_offset; - elf_xword sh_size; - elf_word sh_link; - elf_word sh_info; - elf_xword sh_addralign; - elf_xword sh_entsize; -}; - -/* - * ELF symbol table entry - */ -struct elf32_symbol { - elf_word st_name; - elf32_addr st_value; - elf_word st_size; - uint8_t st_info; - uint8_t st_other; - elf_half st_shndx; -}; -struct elf64_symbol { - elf_word st_name; - uint8_t st_info; - uint8_t st_other; - elf_half st_shndx; - elf64_addr st_value; - elf_xword st_size; -}; - -#ifdef __32_BITS__ -typedef struct elf32_header elf_header_t; -typedef struct elf32_segment_header elf_segment_header_t; -typedef struct elf32_section_header elf_section_header_t; -typedef struct elf32_symbol elf_symbol_t; -#endif -#ifdef __64_BITS__ -typedef struct elf64_header elf_header_t; -typedef struct elf64_segment_header elf_segment_header_t; -typedef struct elf64_section_header elf_section_header_t; -typedef struct elf64_symbol elf_symbol_t; -#endif - -extern const char *elf_error(unsigned int rc); - -#endif - -/** @} - */ Index: uspace/srv/loader/include/elf_load.h =================================================================== --- uspace/srv/loader/include/elf_load.h (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ (revision ) @@ -1,91 +1,0 @@ -/* - * Copyright (c) 2008 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 generic - * @{ - */ -/** @file - * @brief ELF loader structures and public functions. - */ - -#ifndef ELF_LOAD_H_ -#define ELF_LOAD_H_ - -#include -#include -#include - -#include "elf.h" - -typedef enum { - /** Leave all segments in RW access mode. */ - ELDF_RW = 1 -} eld_flags_t; - -/** - * Some data extracted from the headers are stored here - */ -typedef struct { - /** Entry point */ - entry_point_t entry; - - /** ELF interpreter name or NULL if statically-linked */ - const char *interp; - - /** Pointer to the dynamic section */ - void *dynamic; -} elf_info_t; - -/** - * Holds information about an ELF binary being loaded. - */ -typedef struct { - /** Filedescriptor of the file from which we are loading */ - int fd; - - /** Difference between run-time addresses and link-time addresses */ - uintptr_t bias; - - /** Flags passed to the ELF loader. */ - eld_flags_t flags; - - /** A copy of the ELF file header */ - elf_header_t *header; - - /** Store extracted info here */ - elf_info_t *info; -} elf_ld_t; - -int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags, - elf_info_t *info); -void elf_create_pcb(elf_info_t *info, pcb_t *pcb); - -#endif - -/** @} - */ Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision efcebe1bce63b6779458eadc2fd6f252ab7cd703) +++ uspace/srv/loader/main.c (revision 358dc1347a4e02901e65024ae462b98ca9d14566) @@ -59,6 +59,6 @@ #include #include -#include -#include +#include +#include #ifdef CONFIG_RTLD @@ -348,6 +348,6 @@ /* Initialize list of loaded modules */ - list_initialize(&runtime_env->modules_head); - list_append(&prog_mod.modules_link, &runtime_env->modules_head); + list_initialize(&runtime_env->modules); + list_append(&prog_mod.modules_link, &runtime_env->modules); /* Pointer to program module. Used as root of the module graph. */