Index: boot/arch/mips32/src/Makefile =================================================================== --- boot/arch/mips32/src/Makefile (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ boot/arch/mips32/src/Makefile (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -32,9 +32,13 @@ .PHONY: all clean -all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs +all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK) clean: + rm -f $(USPACEDIR)/dist/srv/* + rm -f $(USPACEDIR)/dist/app/* + rm -f $(USPACEDIR)/dist/cfg/net/* + for file in $(RD_SRVS) ; do \ rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ @@ -43,4 +47,7 @@ rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ done + for file in $(NET_CFG) ; do \ + rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \ + done rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(RAW) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs find . -name '*.o' -follow -exec rm \{\} \; Index: boot/arch/mips32/src/Makefile.build =================================================================== --- boot/arch/mips32/src/Makefile.build (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ boot/arch/mips32/src/Makefile.build (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -32,6 +32,6 @@ include ../../../../version +include ../../../../Makefile.common include ../../../../Makefile.config -include ../../../../config.defs include Makefile.common include Makefile.toolchain @@ -77,4 +77,8 @@ $(DEPEND): + rm -f $(USPACEDIR)/dist/srv/* + rm -f $(USPACEDIR)/dist/app/* + rm -f $(USPACEDIR)/dist/cfg/net/* + for file in $(RD_SRVS) ; do \ cp $$file $(USPACEDIR)/dist/srv/ ; \ @@ -82,4 +86,7 @@ for file in $(RD_APPS) ; do \ cp $$file $(USPACEDIR)/dist/app/ ; \ + done + for file in $(NET_CFG) ; do \ + cp $$file $(USPACEDIR)/dist/cfg/net/ ; \ done ifeq ($(RDFMT),tmpfs) Index: boot/arch/mips32/src/Makefile.toolchain =================================================================== --- boot/arch/mips32/src/Makefile.toolchain (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ boot/arch/mips32/src/Makefile.toolchain (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -27,14 +27,5 @@ # -## Toolchain configuration -# - -ifndef CROSS_PREFIX - CROSS_PREFIX = /usr/local -endif - BFD_ARCH = mips -TARGET = mipsel-linux-gnu -TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin JOBFILE = ../../../../tools/jobfile.py @@ -48,6 +39,4 @@ BFD_NAME = elf32-tradbigmips BFD = ecoff-bigmips - TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin - TARGET = mips-linux-gnu endif @@ -55,20 +44,4 @@ BFD_NAME = elf32-tradlittlemips BFD = binary -endif - -ifeq ($(COMPILER),gcc_native) - CC = gcc - AS = as - LD = ld - OBJCOPY = objcopy - OBJDUMP = objdump -endif - -ifeq ($(COMPILER),gcc_cross) - CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc - AS = $(TOOLCHAIN_DIR)/$(TARGET)-as - LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld - OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy - OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump endif Index: kernel/arch/ia32/src/boot/boot.S =================================================================== --- kernel/arch/ia32/src/boot/boot.S (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ kernel/arch/ia32/src/boot/boot.S (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -2,4 +2,5 @@ * Copyright (c) 2001 Jakub Jermar * Copyright (c) 2005 Martin Decky + * Copyright (c) 2011 Martin Sucha * All rights reserved. * @@ -124,5 +125,5 @@ /* Map kernel and turn paging on */ pm_status $status_non_pse - call map_kernel + call map_kernel_non_pse stack_init: @@ -195,6 +196,5 @@ * */ -.global map_kernel -map_kernel: +map_kernel_non_pse: /* Paging features */ movl %cr4, %ecx Index: kernel/arch/ia32/src/smp/ap.S =================================================================== --- kernel/arch/ia32/src/smp/ap.S (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ kernel/arch/ia32/src/smp/ap.S (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -28,7 +28,7 @@ # -# -# Init code for application processors. -# +/* + * Init code for application processors. + */ #include @@ -46,7 +46,9 @@ KDATA=16 -# This piece of code is real-mode and is meant to be aligned at 4K boundary. -# The requirement for such an alignment comes from MP Specification's STARTUP IPI -# requirements. +/* + * This piece of code is real-mode and is meant to be aligned at 4K boundary. + * The requirement for such an alignment comes from MP Specification's + * STARTUP IPI requirements. + */ .align 4096 @@ -57,9 +59,11 @@ movw %ax, %ds - lgdtl ap_gdtr # initialize Global Descriptor Table register + /* initialize Global Descriptor Table register */ + lgdtl ap_gdtr + /* switch to protected mode */ movl %cr0, %eax orl $1, %eax - movl %eax, %cr0 # switch to protected mode + movl %eax, %cr0 jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET @@ -70,13 +74,18 @@ movw %ax, %es movw %ax, %ss - movl $KA2PA(ctx), %eax # KA2PA((uintptr_t) &ctx) + movl $KA2PA(ctx), %eax /* KA2PA((uintptr_t) &ctx) */ movl (%eax), %esp - subl $0x80000000, %esp # KA2PA(ctx.sp) + subl $0x80000000, %esp /* KA2PA(ctx.sp) */ - call map_kernel # map kernel and turn paging on + /* + * Map kernel and turn paging on. + * We assume that when using SMP, PSE is always available + */ + call map_kernel_pse - addl $0x80000000, %esp # PA2KA(ctx.sp) + addl $0x80000000, %esp /* PA2KA(ctx.sp) */ - pushl $0 # create the first stack frame + /* create the first stack frame */ + pushl $0 movl %esp, %ebp Index: kernel/arch/ia64/include/asm.h =================================================================== --- kernel/arch/ia64/include/asm.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ kernel/arch/ia64/include/asm.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -44,10 +44,16 @@ #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) + NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v) { - uintptr_t prt = (uintptr_t) port; - - *((ioport8_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport8_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ( @@ -59,8 +65,12 @@ NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v) { - uintptr_t prt = (uintptr_t) port; - - *((ioport16_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport16_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ( @@ -72,8 +82,12 @@ NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v) { - uintptr_t prt = (uintptr_t) port; - - *((ioport32_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport32_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ( @@ -85,39 +99,63 @@ NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) { - uintptr_t prt = (uintptr_t) port; - - asm volatile ( - "mf\n" - ::: "memory" - ); - - return *((ioport8_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + uint8_t v; + + asm volatile ( + "mf\n" + ::: "memory" + ); + + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport8_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) { - uintptr_t prt = (uintptr_t) port; - - asm volatile ( - "mf\n" - ::: "memory" - ); - - return *((ioport16_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + uint16_t v; + + asm volatile ( + "mf\n" + ::: "memory" + ); + + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport16_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) { - uintptr_t prt = (uintptr_t) port; - - asm volatile ( - "mf\n" - ::: "memory" - ); - - return *((ioport32_t *) (IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + uint32_t v; + + asm volatile ( + "mf\n" + ::: "memory" + ); + + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport32_t *) (IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c =================================================================== --- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -54,4 +54,5 @@ static struct option const long_options[] = { {"size", required_argument, 0, 's'}, + {"sparse", no_argument, 0, 'p'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} @@ -69,4 +70,5 @@ " -h, --help A short option summary\n" " -s, --size sz Size of the file\n" + " -p, --sparse Create a sparse file\n" "\n" "Size is a number followed by 'k', 'm' or 'g' for kB, MB, GB.\n" @@ -115,7 +117,8 @@ ssize_t file_size; ssize_t total_written; - ssize_t to_write, rc; + ssize_t to_write, rc, rc2 = 0; char *file_name; void *buffer; + bool create_sparse = false; file_size = 0; @@ -124,9 +127,12 @@ for (c = 0, optind = 0, opt_ind = 0; c != -1;) { - c = getopt_long(argc, argv, "s:h", long_options, &opt_ind); + c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind); switch (c) { case 'h': help_cmd_mkfile(HELP_LONG); return CMD_SUCCESS; + case 'p': + create_sparse = true; + break; case 's': file_size = read_size(optarg); @@ -154,4 +160,14 @@ printf("%s: failed to create file %s.\n", cmdname, file_name); return CMD_FAILURE; + } + + if (create_sparse && file_size > 0) { + const char byte = 0x00; + + if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0) + goto exit; + + rc2 = write(fd, &byte, sizeof(char)); + goto exit; } @@ -174,11 +190,12 @@ } + free(buffer); +exit: rc = close(fd); - if (rc != 0) { + + if (rc != 0 || rc2 < 0) { printf("%s: Error writing file (%zd).\n", cmdname, rc); return CMD_FAILURE; } - - free(buffer); return CMD_SUCCESS; Index: uspace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/app/netstart/self_test.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,334 @@ +/* + * 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 net + * @{ + */ + +/** @file + * Networking self-tests implementation. + * + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "self_test.h" + +/** Test the statement, compare the result and evaluate. + * + * @param[in] statement The statement to test. + * @param[in] result The expected result. + * + */ +#define TEST(statement, result) \ + do { \ + printf("\n\t%s == %s", #statement, #result); \ + if ((statement) != (result)) { \ + printf("\tfailed\n"); \ + fprintf(stderr, "\nNetwork self-test failed\n"); \ + return EINVAL; \ + } else \ + printf("\tOK"); \ + } while (0) + +#define XMALLOC(var, type) \ + do { \ + (var) = (type *) malloc(sizeof(type)); \ + if ((var) == NULL) { \ + fprintf(stderr, "\nMemory allocation error\n"); \ + return ENOMEM; \ + } \ + } while (0) + +GENERIC_CHAR_MAP_DECLARE(int_char_map, int); +GENERIC_CHAR_MAP_IMPLEMENT(int_char_map, int); + +GENERIC_FIELD_DECLARE(int_field, int); +GENERIC_FIELD_IMPLEMENT(int_field, int); + +INT_MAP_DECLARE(int_map, int); +INT_MAP_IMPLEMENT(int_map, int); + +/** Self-test start function. + * + * Run all self-tests. + * + * @returns EOK on success. + * @returns The first error occurred. + * + */ +int self_test(void) +{ + printf("Running networking self-tests\n"); + + printf("\nChar map test"); + char_map_t cm; + + TEST(char_map_update(&cm, "ucho", 0, 3), EINVAL); + TEST(char_map_initialize(&cm), EOK); + TEST(char_map_exclude(&cm, "bla", 0), CHAR_MAP_NULL); + TEST(char_map_find(&cm, "bla", 0), CHAR_MAP_NULL); + TEST(char_map_add(&cm, "bla", 0, 1), EOK); + TEST(char_map_find(&cm, "bla", 0), 1); + TEST(char_map_add(&cm, "bla", 0, 10), EEXISTS); + TEST(char_map_update(&cm, "bla", 0, 2), EOK); + TEST(char_map_find(&cm, "bla", 0), 2); + TEST(char_map_update(&cm, "ucho", 0, 2), EOK); + TEST(char_map_exclude(&cm, "bla", 0), 2); + TEST(char_map_exclude(&cm, "bla", 0), CHAR_MAP_NULL); + TEST(char_map_find(&cm, "ucho", 0), 2); + TEST(char_map_update(&cm, "ucho", 0, 3), EOK); + TEST(char_map_find(&cm, "ucho", 0), 3); + TEST(char_map_add(&cm, "blabla", 0, 5), EOK); + TEST(char_map_find(&cm, "blabla", 0), 5); + TEST(char_map_add(&cm, "bla", 0, 6), EOK); + TEST(char_map_find(&cm, "bla", 0), 6); + TEST(char_map_exclude(&cm, "bla", 0), 6); + TEST(char_map_find(&cm, "bla", 0), CHAR_MAP_NULL); + TEST(char_map_find(&cm, "blabla", 0), 5); + TEST(char_map_add(&cm, "auto", 0, 7), EOK); + TEST(char_map_find(&cm, "auto", 0), 7); + TEST(char_map_add(&cm, "kara", 0, 8), EOK); + TEST(char_map_find(&cm, "kara", 0), 8); + TEST(char_map_add(&cm, "nic", 0, 9), EOK); + TEST(char_map_find(&cm, "nic", 0), 9); + TEST(char_map_find(&cm, "blabla", 0), 5); + TEST(char_map_add(&cm, "micnicnic", 5, 9), EOK); + TEST(char_map_find(&cm, "micni", 0), 9); + TEST(char_map_find(&cm, "micnicn", 5), 9); + TEST(char_map_add(&cm, "\x10\x0\x2\x2", 4, 15), EOK); + TEST(char_map_find(&cm, "\x10\x0\x2\x2", 4), 15); + + TEST((char_map_destroy(&cm), EOK), EOK); + TEST(char_map_update(&cm, "ucho", 0, 3), EINVAL); + + printf("\nCRC computation test"); + uint32_t value; + + TEST(value = ~compute_crc32(~0, "123456789", 8 * 9), 0xcbf43926); + TEST(value = ~compute_crc32(~0, "1", 8), 0x83dcefb7); + TEST(value = ~compute_crc32(~0, "12", 8 * 2), 0x4f5344cd); + TEST(value = ~compute_crc32(~0, "123", 8 * 3), 0x884863d2); + TEST(value = ~compute_crc32(~0, "1234", 8 * 4), 0x9be3e0a3); + TEST(value = ~compute_crc32(~0, "12345678", 8 * 8), 0x9ae0daaf); + TEST(value = ~compute_crc32(~0, "ahoj pane", 8 * 9), 0x5fc3d706); + + printf("\nDynamic fifo test"); + dyn_fifo_t fifo; + + TEST(dyn_fifo_push(&fifo, 1, 0), EINVAL); + TEST(dyn_fifo_initialize(&fifo, 1), EOK); + TEST(dyn_fifo_push(&fifo, 1, 0), EOK); + TEST(dyn_fifo_pop(&fifo), 1); + TEST(dyn_fifo_pop(&fifo), ENOENT); + TEST(dyn_fifo_push(&fifo, 2, 1), EOK); + TEST(dyn_fifo_push(&fifo, 3, 1), ENOMEM); + TEST(dyn_fifo_push(&fifo, 3, 0), EOK); + TEST(dyn_fifo_pop(&fifo), 2); + TEST(dyn_fifo_pop(&fifo), 3); + TEST(dyn_fifo_push(&fifo, 4, 2), EOK); + TEST(dyn_fifo_push(&fifo, 5, 2), EOK); + TEST(dyn_fifo_push(&fifo, 6, 2), ENOMEM); + TEST(dyn_fifo_push(&fifo, 6, 5), EOK); + TEST(dyn_fifo_push(&fifo, 7, 5), EOK); + TEST(dyn_fifo_pop(&fifo), 4); + TEST(dyn_fifo_pop(&fifo), 5); + TEST(dyn_fifo_push(&fifo, 8, 5), EOK); + TEST(dyn_fifo_push(&fifo, 9, 5), EOK); + TEST(dyn_fifo_push(&fifo, 10, 6), EOK); + TEST(dyn_fifo_push(&fifo, 11, 6), EOK); + TEST(dyn_fifo_pop(&fifo), 6); + TEST(dyn_fifo_pop(&fifo), 7); + TEST(dyn_fifo_push(&fifo, 12, 6), EOK); + TEST(dyn_fifo_push(&fifo, 13, 6), EOK); + TEST(dyn_fifo_push(&fifo, 14, 6), ENOMEM); + TEST(dyn_fifo_push(&fifo, 14, 8), EOK); + TEST(dyn_fifo_pop(&fifo), 8); + TEST(dyn_fifo_pop(&fifo), 9); + TEST(dyn_fifo_pop(&fifo), 10); + TEST(dyn_fifo_pop(&fifo), 11); + TEST(dyn_fifo_pop(&fifo), 12); + TEST(dyn_fifo_pop(&fifo), 13); + TEST(dyn_fifo_pop(&fifo), 14); + TEST(dyn_fifo_destroy(&fifo), EOK); + TEST(dyn_fifo_push(&fifo, 1, 0), EINVAL); + + printf("\nGeneric char map test"); + + int *x; + int *y; + int *z; + int *u; + int *v; + int *w; + + XMALLOC(x, int); + XMALLOC(y, int); + XMALLOC(z, int); + XMALLOC(u, int); + XMALLOC(v, int); + XMALLOC(w, int); + + int_char_map_t icm; + icm.magic = 0; + + TEST(int_char_map_add(&icm, "ucho", 0, z), EINVAL); + TEST(int_char_map_initialize(&icm), EOK); + TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); + TEST(int_char_map_find(&icm, "bla", 0), NULL); + TEST(int_char_map_add(&icm, "bla", 0, x), EOK); + TEST(int_char_map_find(&icm, "bla", 0), x); + TEST(int_char_map_add(&icm, "bla", 0, y), EEXISTS); + TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); + TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); + TEST(int_char_map_add(&icm, "blabla", 0, v), EOK); + TEST(int_char_map_find(&icm, "blabla", 0), v); + TEST(int_char_map_add(&icm, "bla", 0, w), EOK); + TEST(int_char_map_find(&icm, "bla", 0), w); + TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); + TEST(int_char_map_find(&icm, "bla", 0), NULL); + TEST(int_char_map_find(&icm, "blabla", 0), v); + TEST(int_char_map_add(&icm, "auto", 0, u), EOK); + TEST(int_char_map_find(&icm, "auto", 0), u); + TEST((int_char_map_destroy(&icm), EOK), EOK); + TEST(int_char_map_add(&icm, "ucho", 0, z), EINVAL); + + printf("\nGeneric field test"); + + XMALLOC(x, int); + XMALLOC(y, int); + XMALLOC(z, int); + XMALLOC(u, int); + XMALLOC(v, int); + XMALLOC(w, int); + + int_field_t gf; + gf.magic = 0; + + TEST(int_field_add(&gf, x), EINVAL); + TEST(int_field_count(&gf), -1); + TEST(int_field_initialize(&gf), EOK); + TEST(int_field_count(&gf), 0); + TEST(int_field_get_index(&gf, 1), NULL); + TEST(int_field_add(&gf, x), 0); + TEST(int_field_get_index(&gf, 0), x); + TEST((int_field_exclude_index(&gf, 0), EOK), EOK); + TEST(int_field_get_index(&gf, 0), NULL); + TEST(int_field_add(&gf, y), 1); + TEST(int_field_get_index(&gf, 1), y); + TEST(int_field_add(&gf, z), 2); + TEST(int_field_get_index(&gf, 2), z); + TEST(int_field_get_index(&gf, 1), y); + TEST(int_field_count(&gf), 3); + TEST(int_field_add(&gf, u), 3); + TEST(int_field_get_index(&gf, 3), u); + TEST(int_field_add(&gf, v), 4); + TEST(int_field_get_index(&gf, 4), v); + TEST(int_field_add(&gf, w), 5); + TEST(int_field_get_index(&gf, 5), w); + TEST(int_field_count(&gf), 6); + TEST((int_field_exclude_index(&gf, 1), EOK), EOK); + TEST(int_field_get_index(&gf, 1), NULL); + TEST(int_field_get_index(&gf, 3), u); + TEST((int_field_exclude_index(&gf, 7), EOK), EOK); + TEST(int_field_get_index(&gf, 3), u); + TEST(int_field_get_index(&gf, 5), w); + TEST((int_field_exclude_index(&gf, 4), EOK), EOK); + TEST(int_field_get_index(&gf, 4), NULL); + TEST((int_field_destroy(&gf), EOK), EOK); + TEST(int_field_count(&gf), -1); + + printf("\nInt map test"); + + XMALLOC(x, int); + XMALLOC(y, int); + XMALLOC(z, int); + XMALLOC(u, int); + XMALLOC(v, int); + XMALLOC(w, int); + + int_map_t im; + im.magic = 0; + + TEST(int_map_add(&im, 1, x), EINVAL); + TEST(int_map_count(&im), -1); + TEST(int_map_initialize(&im), EOK); + TEST(int_map_count(&im), 0); + TEST(int_map_find(&im, 1), NULL); + TEST(int_map_add(&im, 1, x), 0); + TEST(int_map_find(&im, 1), x); + TEST((int_map_exclude(&im, 1), EOK), EOK); + TEST(int_map_find(&im, 1), NULL); + TEST(int_map_add(&im, 1, y), 1); + TEST(int_map_find(&im, 1), y); + TEST(int_map_add(&im, 4, z), 2); + TEST(int_map_get_index(&im, 2), z); + TEST(int_map_find(&im, 4), z); + TEST(int_map_find(&im, 1), y); + TEST(int_map_count(&im), 3); + TEST(int_map_add(&im, 2, u), 3); + TEST(int_map_find(&im, 2), u); + TEST(int_map_add(&im, 3, v), 4); + TEST(int_map_find(&im, 3), v); + TEST(int_map_get_index(&im, 4), v); + TEST(int_map_add(&im, 6, w), 5); + TEST(int_map_find(&im, 6), w); + TEST(int_map_count(&im), 6); + TEST((int_map_exclude(&im, 1), EOK), EOK); + TEST(int_map_find(&im, 1), NULL); + TEST(int_map_find(&im, 2), u); + TEST((int_map_exclude(&im, 7), EOK), EOK); + TEST(int_map_find(&im, 2), u); + TEST(int_map_find(&im, 6), w); + TEST((int_map_exclude_index(&im, 4), EOK), EOK); + TEST(int_map_get_index(&im, 4), NULL); + TEST(int_map_find(&im, 3), NULL); + TEST((int_map_destroy(&im), EOK), EOK); + TEST(int_map_count(&im), -1); + + printf("\nMeasured strings test"); + + measured_string_ref string = + measured_string_create_bulk("I am a measured string!", 0); + printf("\n%x, %s at %x of %d\n", string, string->value, string->value, + string->length); + + return EOK; +} + +/** @} + */ Index: uspace/app/netstart/self_test.h =================================================================== --- uspace/app/netstart/self_test.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/app/netstart/self_test.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,41 @@ +/* + * 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 net + * @{ + */ + +#ifndef __SELF_TEST_H__ +#define __SELF_TEST_H__ + +extern int self_test(void); + +#endif + +/** @} + */ Index: uspace/app/vuhid/Makefile =================================================================== --- uspace/app/vuhid/Makefile (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/app/vuhid/Makefile (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -47,5 +47,6 @@ SOURCES_INTERFACES = \ - hids/bootkbd.c + hids/bootkbd.c \ + hids/logitech_wireless.c SOURCES = \ @@ -53,4 +54,5 @@ device.c \ ifaces.c \ + life.c \ stdreq.c \ $(SOURCES_INTERFACES) Index: uspace/app/vuhid/hids/bootkbd.c =================================================================== --- uspace/app/vuhid/hids/bootkbd.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/app/vuhid/hids/bootkbd.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -93,34 +93,11 @@ 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static size_t in_data_count = sizeof(in_data)/INPUT_SIZE; -// FIXME - locking -static size_t in_data_position = 0; - -static int on_data_in(vuhid_interface_t *iface, - void *buffer, size_t buffer_size, size_t *act_buffer_size) -{ - static size_t last_pos = (size_t) -1; - size_t pos = in_data_position; - if (pos >= in_data_count) { - return EBADCHECKSUM; - } - - if (last_pos == pos) { - return ENAK; - } - - if (buffer_size > INPUT_SIZE) { - buffer_size = INPUT_SIZE; - } - - if (act_buffer_size != NULL) { - *act_buffer_size = buffer_size; - } - - memcpy(buffer, in_data + pos * INPUT_SIZE, buffer_size); - last_pos = pos; - - return EOK; -} +static vuhid_interface_life_t boot_life = { + .data_in = in_data, + .data_in_count = sizeof(in_data)/INPUT_SIZE, + .data_in_pos_change_delay = 500, + .msg_born = "Boot keyboard comes to life...", + .msg_die = "Boot keyboard died." +}; static int on_data_out(vuhid_interface_t *iface, @@ -141,17 +118,4 @@ } - -static void live(vuhid_interface_t *iface) -{ - async_usleep(1000 * 1000 * 5); - usb_log_debug("Boot keyboard comes to life...\n"); - while (in_data_position < in_data_count) { - async_usleep(1000 * 500); - in_data_position++; - } - usb_log_debug("Boot keyboard died.\n"); -} - - vuhid_interface_t vuhid_interface_bootkbd = { .id = "boot", @@ -164,11 +128,12 @@ .in_data_size = INPUT_SIZE, - .on_data_in = on_data_in, + .on_data_in = interface_live_on_data_in, .out_data_size = 1, .on_data_out = on_data_out, - .live = live, + .live = interface_life_live, + .interface_data = &boot_life, .vuhid_data = NULL }; Index: uspace/app/vuhid/hids/logitech_wireless.c =================================================================== --- uspace/app/vuhid/hids/logitech_wireless.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/app/vuhid/hids/logitech_wireless.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 usbvirthid + * @{ + */ +/** @file + * Logitech wireless mouse-keyboard combo simulation (see issue 349). + */ +#include "../virthid.h" +#include +#include +#include +#include + +static uint8_t iface1_report_descriptor[] = { + 0x05, 0x01, 0x09, 0x02, 0xA1, 0x01, 0x85, 0x02, 0x09, 0x01, + 0xA1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x10, 0x15, 0x00, + 0x25, 0x01, 0x95, 0x10, 0x75, 0x01, 0x81, 0x02, 0x05, 0x01, + 0x16, 0x01, 0xF8, 0x26, 0xFF, 0x07, 0x75, 0x0C, 0x95, 0x02, + 0x09, 0x30, 0x09, 0x31, 0x81, 0x06, 0x15, 0x81, 0x25, 0x7F, + 0x75, 0x08, 0x95, 0x01, 0x09, 0x38, 0x81, 0x06, 0x05, 0x0C, + 0x0A, 0x38, 0x02, 0x95, 0x01, 0x81, 0x06, 0xC0, 0xC0, 0x05, + 0x0C, 0x09, 0x01, 0xA1, 0x01, 0x85, 0x03, 0x75, 0x10, 0x95, + 0x02, 0x15, 0x01, 0x26, 0x8C, 0x02, 0x19, 0x01, 0x2A, 0x8C, + 0x02, 0x81, 0x00, 0xC0, 0x05, 0x01, 0x09, 0x80, 0xA1, 0x01, + 0x85, 0x04, 0x75, 0x02, 0x95, 0x01, 0x15, 0x01, 0x25, 0x03, + 0x09, 0x82, 0x09, 0x81, 0x09, 0x83, 0x81, 0x60, 0x75, 0x06, + 0x81, 0x03, 0xC0, 0x06, 0xBC, 0xFF, 0x09, 0x88, 0xA1, 0x01, + 0x85, 0x08, 0x19, 0x01, 0x29, 0xFF, 0x15, 0x01, 0x26, 0xFF, + 0x00, 0x75, 0x08, 0x95, 0x01, 0x81, 0x00, 0xC0 +}; +#define iface1_input_size 8 +static uint8_t iface1_in_data[] = { + /*0, 0, 0, 0, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 0, + 0, 9, 9, 0, 0, 0, 0, 0,*/ + 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static vuhid_interface_life_t iface1_life = { + .data_in = iface1_in_data, + .data_in_count = sizeof(iface1_in_data)/iface1_input_size, + .data_in_pos_change_delay = 50, + .msg_born = "Mouse of Logitech Unifying Receiver comes to life...", + .msg_die = "Mouse of Logitech Unifying Receiver disconnected." +}; + + +vuhid_interface_t vuhid_interface_logitech_wireless_1 = { + .id = "lw1", + .name = "Logitech Unifying Receiver, interface 1 (mouse)", + .usb_subclass = USB_HID_SUBCLASS_BOOT, + .usb_protocol = USB_HID_PROTOCOL_MOUSE, + + .report_descriptor = iface1_report_descriptor, + .report_descriptor_size = sizeof(iface1_report_descriptor), + + .in_data_size = iface1_input_size, + .on_data_in = interface_live_on_data_in, + + .out_data_size = 0, + .on_data_out = NULL, + + .live = interface_life_live, + + .interface_data = &iface1_life, + .vuhid_data = NULL +}; + +/** + * @} + */ Index: uspace/app/vuhid/ifaces.c =================================================================== --- uspace/app/vuhid/ifaces.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/app/vuhid/ifaces.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -38,7 +38,9 @@ extern vuhid_interface_t vuhid_interface_bootkbd; +extern vuhid_interface_t vuhid_interface_logitech_wireless_1; vuhid_interface_t *available_hid_interfaces[] = { &vuhid_interface_bootkbd, + &vuhid_interface_logitech_wireless_1, NULL }; Index: uspace/app/vuhid/life.c =================================================================== --- uspace/app/vuhid/life.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/app/vuhid/life.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 usbvirthid + * @{ + */ +/** + * @file + * + */ +#include +#include +#include "virthid.h" + + +void interface_life_live(vuhid_interface_t *iface) +{ + vuhid_interface_life_t *data = iface->interface_data; + data->data_in_pos = 0; + data->data_in_last_pos = (size_t) -1; + async_usleep(1000 * 1000 * 5); + usb_log_debug("%s\n", data->msg_born); + while (data->data_in_pos < data->data_in_count) { + async_usleep(1000 * data->data_in_pos_change_delay); + // FIXME: proper locking + data->data_in_pos++; + } + usb_log_debug("%s\n", data->msg_die); +} + + + +int interface_live_on_data_in(vuhid_interface_t *iface, + void *buffer, size_t buffer_size, size_t *act_buffer_size) +{ + vuhid_interface_life_t *life = iface->interface_data; + size_t pos = life->data_in_pos; + if (pos >= life->data_in_count) { + return EBADCHECKSUM; + } + + if (pos == life->data_in_last_pos) { + return ENAK; + } + + if (buffer_size > iface->in_data_size) { + buffer_size = iface->in_data_size; + } + + if (act_buffer_size != NULL) { + *act_buffer_size = buffer_size; + } + + memcpy(buffer, life->data_in + pos * iface->in_data_size, buffer_size); + life->data_in_last_pos = pos; + + return EOK; +} + +/** @} + */ Index: uspace/app/vuhid/virthid.h =================================================================== --- uspace/app/vuhid/virthid.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/app/vuhid/virthid.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -82,4 +82,27 @@ typedef struct { + /** Buffer with data from device to the host. */ + uint8_t *data_in; + /** Number of items in @c data_in. + * The total size of @c data_in buffer shall be + * data_in_count * vuhid_interface_t.in_data_size. + */ + size_t data_in_count; + + /** Current position in the data buffer. */ + size_t data_in_pos; + /** Previous position. */ + size_t data_in_last_pos; + + /** Delay between transition to "next" input buffer (in ms). */ + size_t data_in_pos_change_delay; + + /** Message to print when interface becomes alive. */ + const char *msg_born; + /** Message to print when interface dies. */ + const char *msg_die; +} vuhid_interface_life_t; + +typedef struct { uint8_t length; uint8_t type; @@ -94,4 +117,8 @@ void wait_for_interfaces_death(usbvirt_device_t *); +void interface_life_live(vuhid_interface_t *); +int interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *); + + #endif /** Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -75,5 +75,4 @@ /** Default idle rate for mouses. */ static const uint8_t IDLE_RATE = 0; -static const size_t USB_MOUSE_BUTTON_COUNT = 3; /*----------------------------------------------------------------------------*/ @@ -397,4 +396,46 @@ /*----------------------------------------------------------------------------*/ +/** Get highest index of a button mentioned in given report. + * + * @param report HID report. + * @param report_id Report id we are interested in. + * @return Highest button mentioned in the report. + * @retval 1 No button was mentioned. + * + */ +static size_t usb_mouse_get_highest_button(usb_hid_report_t *report, uint8_t report_id) +{ + size_t highest_button = 0; + + usb_hid_report_path_t *path = usb_hid_report_path(); + usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); + usb_hid_report_path_set_report_id(path, report_id); + + usb_hid_report_field_t *field = NULL; + + /* Break from within. */ + while (1) { + field = usb_hid_report_get_sibling( + report, field, path, + USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + USB_HID_REPORT_TYPE_INPUT); + /* No more buttons? */ + if (field == NULL) { + break; + } + + size_t current_button = field->usage - field->usage_minimum; + if (current_button > highest_button) { + highest_button = current_button; + } + } + + usb_hid_report_path_free(path); + + return highest_button; +} + +/*----------------------------------------------------------------------------*/ + int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) { @@ -414,13 +455,21 @@ } - mouse_dev->buttons = (int32_t *)calloc(USB_MOUSE_BUTTON_COUNT, - sizeof(int32_t)); + // FIXME: This may not be optimal since stupid hardware vendor may + // use buttons 1, 2, 3 and 6000 and we would allocate array of + // 6001*4B and use only 4 items in it. + // Since I doubt that hardware producers would do that, I think + // that the current solution is good enough. + /* Adding 1 because we will be accessing buttons[highest]. */ + mouse_dev->buttons_count = usb_mouse_get_highest_button(hid_dev->report, + hid_dev->report_id) + 1; + mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t)); if (mouse_dev->buttons == NULL) { - usb_log_fatal("No memory!\n"); + usb_log_error(NAME ": out of memory, giving up on device!\n"); free(mouse_dev); return ENOMEM; } - + + // save the Mouse device structure into the HID device structure *data = mouse_dev; Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -50,5 +50,7 @@ async_sess_t *wheel_sess; + /* Mouse buttons statuses. */ int32_t *buttons; + size_t buttons_count; ddf_dev_ops_t ops; Index: uspace/drv/bus/usb/usbhub/Makefile =================================================================== --- uspace/drv/bus/usb/usbhub/Makefile (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhub/Makefile (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -1,4 +1,5 @@ # # Copyright (c) 2010 Vojtech Horky +# Copyright (c) 2011 Jan Vesely # All rights reserved. # @@ -43,7 +44,6 @@ SOURCES = \ main.c \ - utils.c \ usbhub.c \ - ports.c + port.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbhub/main.c =================================================================== --- uspace/drv/bus/usb/usbhub/main.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhub/main.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -38,7 +39,7 @@ #include #include +#include #include "usbhub.h" -#include "usbhub_private.h" /** Hub status-change endpoint description. @@ -56,5 +57,5 @@ /** - * usb hub driver operations + * USB hub driver operations * * The most important one is add_device, which is set to usb_hub_add_device. @@ -64,15 +65,10 @@ }; -/** - * hub endpoints, excluding control endpoint - */ +/** Hub endpoints, excluding control endpoint. */ static usb_endpoint_description_t *usb_hub_endpoints[] = { &hub_status_change_endpoint_description, - NULL + NULL, }; - -/** - * static usb hub driver information - */ +/** Static usb hub driver information. */ static usb_driver_t usb_hub_driver = { .name = NAME, @@ -85,5 +81,4 @@ { printf(NAME ": HelenOS USB hub driver.\n"); - usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME); @@ -94,3 +89,2 @@ * @} */ - Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/drv/bus/usb/usbhub/port.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,481 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * Copyright (c) 2011 Jan Vesely + * 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 drvusbhub + * @{ + */ +/** @file + * Hub ports functions. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "port.h" +#include "usbhub.h" +#include "status.h" + +/** Information for fibril for device discovery. */ +struct add_device_phase1 { + usb_hub_info_t *hub; + usb_hub_port_t *port; + usb_speed_t speed; +}; + +static void usb_hub_port_removed_device(usb_hub_port_t *port, + usb_hub_info_t *hub); +static void usb_hub_port_reset_completed(usb_hub_port_t *port, + usb_port_status_t status); +static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status); +static int enable_port_callback(int port_no, void *arg); +static int add_device_phase1_worker_fibril(void *arg); +static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_info_t *hub, + usb_speed_t speed); + +/** + * Clear feature on hub port. + * + * @param hc Host controller telephone + * @param address Hub address + * @param port_index Port + * @param feature Feature selector + * @return Operation result + */ +int usb_hub_port_clear_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature) +{ + assert(port); + usb_device_request_setup_packet_t clear_request = { + .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE, + .request = USB_DEVREQ_CLEAR_FEATURE, + .value = feature, + .index = port->port_number, + .length = 0, + }; + return usb_pipe_control_write(port->control_pipe, &clear_request, + sizeof(clear_request), NULL, 0); +} +/*----------------------------------------------------------------------------*/ +/** + * Clear feature on hub port. + * + * @param hc Host controller telephone + * @param address Hub address + * @param port_index Port + * @param feature Feature selector + * @return Operation result + */ +int usb_hub_port_set_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature) +{ + assert(port); + usb_device_request_setup_packet_t clear_request = { + .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE, + .request = USB_DEVREQ_SET_FEATURE, + .index = port->port_number, + .value = feature, + .length = 0, + }; + return usb_pipe_control_write(port->control_pipe, &clear_request, + sizeof(clear_request), NULL, 0); +} +/*----------------------------------------------------------------------------*/ +void usb_hub_port_reset_fail(usb_hub_port_t *port) +{ + assert(port); + fibril_mutex_lock(&port->mutex); + port->reset_completed = true; + port->reset_okay = false; + fibril_condvar_broadcast(&port->reset_cv); + fibril_mutex_unlock(&port->mutex); +} +/*----------------------------------------------------------------------------*/ +/** + * Process interrupts on given hub port + * + * Accepts connection, over current and port reset change. + * @param hub hub representation + * @param port port number, starting from 1 + */ +void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub) +{ + assert(port); + assert(hub); + usb_log_debug("Interrupt at port %zu\n", port->port_number); + + usb_port_status_t status; + const int opResult = get_port_status(port, &status); + if (opResult != EOK) { + usb_log_error("Failed to get port %zu status: %s.\n", + port->port_number, str_error(opResult)); + return; + } + + /* Connection change */ + if (status & USB_HUB_PORT_C_STATUS_CONNECTION) { + const bool connected = + (status & USB_HUB_PORT_STATUS_CONNECTION) != 0; + usb_log_debug("Connection change on port %zu: device %s.\n", + port->port_number, connected ? "attached" : "removed"); + + /* ACK the change */ + const int opResult = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_CONNECTION); + if (opResult != EOK) { + usb_log_warning("Failed to clear port-change-connection" + " flag: %s.\n", str_error(opResult)); + } + + if (connected) { + const int opResult = create_add_device_fibril(port, hub, + usb_port_speed(status)); + if (opResult != EOK) { + usb_log_error( + "Cannot handle change on port %zu: %s.\n", + port->port_number, str_error(opResult)); + } + } else { + /* If enabled change was reported leave the removal + * to that handler, it shall ACK the change too. */ + if (!(status & USB_HUB_PORT_C_STATUS_ENABLED)) { + usb_hub_port_removed_device(port, hub); + } + } + } + + /* Enable change, ports are automatically disabled on errors. */ + if (status & USB_HUB_PORT_C_STATUS_ENABLED) { + usb_log_info("Port %zu, disabled because of errors.\n", + port->port_number); + usb_hub_port_removed_device(port, hub); + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_ENABLE); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu enable change feature: " + "%s.\n", port->port_number, str_error(rc)); + } + + } + + /* Suspend change */ + if (status & USB_HUB_PORT_C_STATUS_SUSPEND) { + usb_log_error("Port %zu went to suspend state, this should" + "NOT happen as we do not support suspend state!", + port->port_number); + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_SUSPEND); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu suspend change feature: " + "%s.\n", port->port_number, str_error(rc)); + } + } + + /* Over current */ + if (status & USB_HUB_PORT_C_STATUS_OC) { + /* According to the USB specs: + * 11.13.5 Over-current Reporting and Recovery + * Hub device is responsible for putting port in power off + * mode. USB system software is responsible for powering port + * back on when the over-current condition is gone */ + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_OVER_CURRENT); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu OC change feature: %s.\n", + port->port_number, str_error(rc)); + } + if (!(status & ~USB_HUB_PORT_STATUS_OC)) { + const int rc = usb_hub_port_set_feature( + port, USB_HUB_FEATURE_PORT_POWER); + if (rc != EOK) { + usb_log_error( + "Failed to set port %zu power after OC:" + " %s.\n", port->port_number, str_error(rc)); + } + } + } + + /* Port reset, set on port reset complete. */ + if (status & USB_HUB_PORT_C_STATUS_RESET) { + usb_hub_port_reset_completed(port, status); + } + + usb_log_debug("Port %zu status 0x%08" PRIx32 "\n", + port->port_number, status); +} + +/** + * routine called when a device on port has been removed + * + * If the device on port had default address, it releases default address. + * Otherwise does not do anything, because DDF does not allow to remove device + * from it`s device tree. + * @param hub hub representation + * @param port port number, starting from 1 + */ +static void usb_hub_port_removed_device(usb_hub_port_t *port, + usb_hub_info_t *hub) +{ + assert(port); + assert(hub); + if (port->attached_device.address >= 0) { + fibril_mutex_lock(&port->mutex); + port->attached_device.address = -1; + port->attached_device.handle = 0; + fibril_mutex_unlock(&port->mutex); + usb_log_info("Removed device on port %zu.\n", + port->port_number); + } else { + usb_log_warning( + "Device on port %zu removed before being registered.\n", + port->port_number); + + /* + * Device was removed before port reset completed. + * We will announce a failed port reset to unblock the + * port reset callback from new device wrapper. + */ + usb_hub_port_reset_fail(port); + } +} + +/** + * Process port reset change + * + * After this change port should be enabled, unless some problem occurred. + * This functions triggers second phase of enabling new device. + * @param hub + * @param port + * @param status + */ +static void usb_hub_port_reset_completed(usb_hub_port_t *port, + usb_port_status_t status) +{ + assert(port); + fibril_mutex_lock(&port->mutex); + /* Finalize device adding. */ + port->reset_completed = true; + port->reset_okay = (status & USB_HUB_PORT_STATUS_ENABLED) != 0; + + if (port->reset_okay) { + usb_log_debug("Port %zu reset complete.\n", port->port_number); + } else { + usb_log_warning( + "Port %zu reset complete but port not enabled.\n", + port->port_number); + } + fibril_condvar_broadcast(&port->reset_cv); + fibril_mutex_unlock(&port->mutex); + + /* Clear the port reset change. */ + int rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu reset change feature: %s.\n", + port->port_number, str_error(rc)); + } +} +/*----------------------------------------------------------------------------*/ +/** Retrieve port status. + * + * @param[in] ctrl_pipe Control pipe to use. + * @param[in] port Port number (starting at 1). + * @param[out] status Where to store the port status. + * @return Error code. + */ +static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status) +{ + assert(port); + /* USB hub specific GET_PORT_STATUS request. See USB Spec 11.16.2.6 + * Generic GET_STATUS request cannot be used because of the difference + * in status data size (2B vs. 4B)*/ + const usb_device_request_setup_packet_t request = { + .request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS, + .request = USB_HUB_REQUEST_GET_STATUS, + .value = 0, + .index = port->port_number, + .length = sizeof(usb_port_status_t), + }; + size_t recv_size; + usb_port_status_t status_tmp; + + const int rc = usb_pipe_control_read(port->control_pipe, + &request, sizeof(usb_device_request_setup_packet_t), + &status_tmp, sizeof(status_tmp), &recv_size); + if (rc != EOK) { + return rc; + } + + if (recv_size != sizeof (status_tmp)) { + return ELIMIT; + } + + if (status != NULL) { + *status = status_tmp; + } + + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** Callback for enabling a specific port. + * + * We wait on a CV until port is reseted. + * That is announced via change on interrupt pipe. + * + * @param port_no Port number (starting at 1). + * @param arg Custom argument, points to @c usb_hub_info_t. + * @return Error code. + */ +static int enable_port_callback(int port_no, void *arg) +{ + usb_hub_port_t *port = arg; + const int rc = + usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET); + if (rc != EOK) { + usb_log_warning("Port reset failed: %s.\n", str_error(rc)); + return rc; + } + + /* + * Wait until reset completes. + */ + fibril_mutex_lock(&port->mutex); + while (!port->reset_completed) { + fibril_condvar_wait(&port->reset_cv, &port->mutex); + } + fibril_mutex_unlock(&port->mutex); + + if (port->reset_okay) { + return EOK; + } else { + return ESTALL; + } +} + +/** Fibril for adding a new device. + * + * Separate fibril is needed because the port reset completion is announced + * via interrupt pipe and thus we cannot block here. + * + * @param arg Pointer to struct add_device_phase1. + * @return 0 Always. + */ +static int add_device_phase1_worker_fibril(void *arg) +{ + struct add_device_phase1 *data = arg; + assert(data); + + usb_address_t new_address; + devman_handle_t child_handle; + + const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev, + &data->hub->connection, data->speed, + enable_port_callback, (int) data->port->port_number, + data->port, &new_address, &child_handle, + NULL, NULL, NULL); + + if (rc != EOK) { + usb_log_error("Failed registering device on port %zu: %s.\n", + data->port->port_number, str_error(rc)); + goto leave; + } + + fibril_mutex_lock(&data->port->mutex); + data->port->attached_device.handle = child_handle; + data->port->attached_device.address = new_address; + fibril_mutex_unlock(&data->port->mutex); + + usb_log_info("Detected new device on `%s' (port %zu), " + "address %d (handle %" PRIun ").\n", + data->hub->usb_device->ddf_dev->name, data->port->port_number, + new_address, child_handle); + +leave: + fibril_mutex_lock(&data->hub->pending_ops_mutex); + assert(data->hub->pending_ops_count > 0); + --data->hub->pending_ops_count; + fibril_condvar_signal(&data->hub->pending_ops_cv); + fibril_mutex_unlock(&data->hub->pending_ops_mutex); + + free(arg); + + return EOK; +} + +/** Start device adding when connection change is detected. + * + * This fires a new fibril to complete the device addition. + * + * @param hub Hub where the change occured. + * @param port Port index (starting at 1). + * @param speed Speed of the device. + * @return Error code. + */ +static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_info_t *hub, + usb_speed_t speed) +{ + assert(hub); + assert(port); + struct add_device_phase1 *data + = malloc(sizeof (struct add_device_phase1)); + if (data == NULL) { + return ENOMEM; + } + data->hub = hub; + data->port = port; + data->speed = speed; + + fibril_mutex_lock(&port->mutex); + port->reset_completed = false; + fibril_mutex_unlock(&port->mutex); + + fid_t fibril = fibril_create(add_device_phase1_worker_fibril, data); + if (fibril == 0) { + free(data); + return ENOMEM; + } + fibril_mutex_lock(&hub->pending_ops_mutex); + ++hub->pending_ops_count; + fibril_mutex_unlock(&hub->pending_ops_mutex); + fibril_add_ready(fibril); + + return EOK; +} + +/** + * @} + */ Index: uspace/drv/bus/usb/usbhub/port.h =================================================================== --- uspace/drv/bus/usb/usbhub/port.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/drv/bus/usb/usbhub/port.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * Copyright (c) 2011 Jan Vesely + * 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 drvusbhub + * @{ + */ +/** @file + * Hub ports related functions. + */ +#ifndef DRV_USBHUB_PORT_H +#define DRV_USBHUB_PORT_H + +#include +#include +#include + +typedef struct usb_hub_info_t usb_hub_info_t; + +/** Information about single port on a hub. */ +typedef struct { + size_t port_number; + usb_pipe_t *control_pipe; + /** Mutex needed not only by CV for checking port reset. */ + fibril_mutex_t mutex; + /** CV for waiting to port reset completion. */ + fibril_condvar_t reset_cv; + /** Whether port reset is completed. + * Guarded by @c reset_mutex. + */ + bool reset_completed; + /** Whether to announce the port reset as successful. */ + bool reset_okay; + + /** Information about attached device. */ + usb_hc_attached_device_t attached_device; +} usb_hub_port_t; + +/** Initialize hub port information. + * + * @param port Port to be initialized. + */ +static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number, + usb_pipe_t *control_pipe) +{ + assert(port); + port->attached_device.address = -1; + port->attached_device.handle = 0; + port->port_number = port_number; + port->control_pipe = control_pipe; + fibril_mutex_initialize(&port->mutex); + fibril_condvar_initialize(&port->reset_cv); +} + +void usb_hub_port_reset_fail(usb_hub_port_t *port); +void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub); +int usb_hub_port_clear_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature); +int usb_hub_port_set_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature); + +#endif +/** + * @} + */ Index: pace/drv/bus/usb/usbhub/port_status.h =================================================================== --- uspace/drv/bus/usb/usbhub/port_status.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,360 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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 drvusbhub - * @{ - */ - -#ifndef HUB_PORT_STATUS_H -#define HUB_PORT_STATUS_H - -#include -#include -#include -#include "usbhub_private.h" - -/** - * structure holding port status and changes flags. - * should not be accessed directly, use supplied getter/setter methods. - * - * For more information refer to table 11-15 in - * "Universal Serial Bus Specification Revision 1.1" - * - */ -typedef uint32_t usb_port_status_t; - -/** - * structure holding hub status and changes flags. - * should not be accessed directly, use supplied getter/setter methods. - * - * For more information refer to table 11.16.2.5 in - * "Universal Serial Bus Specification Revision 1.1" - * - */ -typedef uint32_t usb_hub_status_t; - -/** - * set values in request to be it a port status request - * @param request - * @param port - */ -static inline void usb_hub_set_port_status_request( - usb_device_request_setup_packet_t *request, uint16_t port) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS; - request->request = USB_HUB_REQUEST_GET_STATUS; - request->value = 0; - request->length = 4; -} - -/** - * set values in request to be it a port status request - * @param request - * @param port - */ -static inline void usb_hub_set_hub_status_request( - usb_device_request_setup_packet_t *request) { - request->index = 0; - request->request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS; - request->request = USB_HUB_REQUEST_GET_STATUS; - request->value = 0; - request->length = 4; -} - -/** - * create request for usb hub port status - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_port_status_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_port_status_request(result, port); - return result; -} - -/** - * set the device request to be a port feature enable request - * @param request - * @param port - * @param feature_selector - */ -static inline void usb_hub_set_enable_port_feature_request( - usb_device_request_setup_packet_t *request, uint16_t port, - uint16_t feature_selector) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = feature_selector; - request->length = 0; -} - -/** - * set the device request to be a port feature clear request - * @param request - * @param port - * @param feature_selector - */ -static inline void usb_hub_set_disable_port_feature_request( - usb_device_request_setup_packet_t *request, uint16_t port, - uint16_t feature_selector - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_CLEAR_FEATURE; - request->value = feature_selector; - request->length = 0; -} - -/** - * set the device request to be a port enable request - * @param request - * @param port - */ -static inline void usb_hub_set_enable_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_C_PORT_ENABLE; - request->length = 0; -} - -/** - * enable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_enable_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_enable_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_disable_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_C_PORT_SUSPEND; - request->length = 0; -} - -/** - * disable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_disable_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_disable_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_reset_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_PORT_RESET; - request->length = 0; -} - -/** - * disable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_reset_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_reset_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_power_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_PORT_POWER; - request->length = 0; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_unset_power_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_CLEAR_FEATURE; - request->value = USB_HUB_FEATURE_PORT_POWER; - request->length = 0; -} - -/** - * get i`th bit of port status - * - * @param status - * @param idx - * @return - */ -static inline bool usb_port_is_status(usb_port_status_t status, int idx) { - return (status & (1 << idx)) != 0; -} - -/** - * set i`th bit of port status - * - * @param status - * @param idx - * @param value - */ -static inline void usb_port_status_set_bit( - usb_port_status_t * status, int idx, bool value) { - (*status) = value ? - ((*status) | (1 << (idx))) : - ((*status)&(~(1 << (idx)))); -} - -/** - * get i`th bit of hub status - * - * @param status - * @param idx - * @return - */ -static inline bool usb_hub_is_status(usb_hub_status_t status, int idx) { - return (status & (1 << idx)) != 0; -} - -/** - * set i`th bit of hub status - * - * @param status - * @param idx - * @param value - */ -static inline void usb_hub_status_set_bit( - usb_hub_status_t *status, int idx, bool value) { - (*status) = value ? - ((*status) | (1 << (idx))) : - ((*status)&(~(1 << (idx)))); -} - -/** - * low speed device on the port indicator - * - * @param status - * @return true if low speed device is attached - */ -static inline bool usb_port_low_speed(usb_port_status_t status) { - return usb_port_is_status(status, 9); -} - -/** - * set low speed device connected bit in port status - * - * @param status - * @param low_speed value of the bit - */ -static inline void usb_port_set_low_speed(usb_port_status_t *status, bool low_speed) { - usb_port_status_set_bit(status, 9, low_speed); -} - -//high speed device attached - -/** - * high speed device on the port indicator - * - * @param status - * @return true if high speed device is on port - */ -static inline bool usb_port_high_speed(usb_port_status_t status) { - return usb_port_is_status(status, 10); -} - -/** - * set high speed device bit in port status - * - * @param status - * @param high_speed value of the bit - */ -static inline void usb_port_set_high_speed(usb_port_status_t *status, bool high_speed) { - usb_port_status_set_bit(status, 10, high_speed); -} - -/** - * speed getter for port status - * - * @param status - * @return speed of usb device (for more see usb specification) - */ -static inline usb_speed_t usb_port_speed(usb_port_status_t status) { - if (usb_port_low_speed(status)) - return USB_SPEED_LOW; - if (usb_port_high_speed(status)) - return USB_SPEED_HIGH; - return USB_SPEED_FULL; -} - - - -#endif /* HUB_PORT_STATUS_H */ - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/ports.c =================================================================== --- uspace/drv/bus/usb/usbhub/ports.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,465 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * 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 drvusbhub - * @{ - */ -/** @file - * Hub ports functions. - */ - -#include -#include -#include -#include -#include - -#include - -#include "ports.h" -#include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" - -/** Information for fibril for device discovery. */ -struct add_device_phase1 { - usb_hub_info_t *hub; - size_t port; - usb_speed_t speed; -}; - -/** - * count of port status changes that are not explicitly handled by - * any function here and must be cleared by hand - */ -static const unsigned int non_handled_changes_count = 2; - -/** - * port status changes that are not explicitly handled by - * any function here and must be cleared by hand - */ -static const int non_handled_changes[] = { - USB_HUB_FEATURE_C_PORT_ENABLE, - USB_HUB_FEATURE_C_PORT_SUSPEND -}; - -static void usb_hub_removed_device( - usb_hub_info_t *hub, uint16_t port); - -static void usb_hub_port_reset_completed(usb_hub_info_t *hub, - uint16_t port, uint32_t status); - -static void usb_hub_port_over_current(usb_hub_info_t *hub, - uint16_t port, uint32_t status); - -static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port, - usb_port_status_t *status); - -static int enable_port_callback(int port_no, void *arg); - -static int add_device_phase1_worker_fibril(void *arg); - -static int create_add_device_fibril(usb_hub_info_t *hub, size_t port, - usb_speed_t speed); - -/** - * Process interrupts on given hub port - * - * Accepts connection, over current and port reset change. - * @param hub hub representation - * @param port port number, starting from 1 - */ -void usb_hub_process_port_interrupt(usb_hub_info_t *hub, - uint16_t port) { - usb_log_debug("Interrupt at port %zu\n", (size_t) port); - //determine type of change - //usb_pipe_t *pipe = hub->control_pipe; - - int opResult; - - usb_port_status_t status; - opResult = get_port_status(&hub->usb_device->ctrl_pipe, port, &status); - if (opResult != EOK) { - usb_log_error("Failed to get port %zu status: %s.\n", - (size_t) port, str_error(opResult)); - return; - } - //connection change - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_CONNECTION)) { - bool device_connected = usb_port_is_status(status, - USB_HUB_FEATURE_PORT_CONNECTION); - usb_log_debug("Connection change on port %zu: %s.\n", - (size_t) port, - device_connected ? "device attached" : "device removed"); - - if (device_connected) { - opResult = create_add_device_fibril(hub, port, - usb_port_speed(status)); - if (opResult != EOK) { - usb_log_error( - "Cannot handle change on port %zu: %s.\n", - (size_t) port, str_error(opResult)); - } - } else { - usb_hub_removed_device(hub, port); - } - } - //over current - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT)) { - //check if it was not auto-resolved - usb_log_debug("Overcurrent change on port\n"); - usb_hub_port_over_current(hub, port, status); - } - //port reset - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_RESET)) { - usb_hub_port_reset_completed(hub, port, status); - } - usb_log_debug("Port %d status 0x%08" PRIx32 "\n", (int) port, status); - - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_CONNECTION, false); - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_RESET, false); - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT, false); - - //clearing not yet handled changes - unsigned int feature_idx; - for (feature_idx = 0; - feature_idx < non_handled_changes_count; - ++feature_idx) { - unsigned int bit_idx = non_handled_changes[feature_idx]; - if (status & (1 << bit_idx)) { - usb_log_info( - "There was not yet handled change on port %d: %d" - ";clearing it\n", - port, bit_idx); - int opResult = usb_hub_clear_port_feature( - hub->control_pipe, - port, bit_idx); - if (opResult != EOK) { - usb_log_warning( - "Could not clear port flag %d: %s\n", - bit_idx, str_error(opResult) - ); - } - usb_port_status_set_bit( - &status, bit_idx, false); - } - } - if (status >> 16) { - usb_log_info("There is still some unhandled change %X\n", - status); - } -} - -/** - * routine called when a device on port has been removed - * - * If the device on port had default address, it releases default address. - * Otherwise does not do anything, because DDF does not allow to remove device - * from it`s device tree. - * @param hub hub representation - * @param port port number, starting from 1 - */ -static void usb_hub_removed_device( - usb_hub_info_t *hub, uint16_t port) { - - int opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_CONNECTION); - if (opResult != EOK) { - usb_log_warning("Could not clear port-change-connection flag\n"); - } - /** \TODO remove device from device manager - not yet implemented in - * devide manager - */ - - //close address - - usb_hub_port_t *the_port = hub->ports + port; - - fibril_mutex_lock(&hub->port_mutex); - - if (the_port->attached_device.address >= 0) { - usb_log_warning("Device unplug on `%s' (port %zu): " \ - "not implemented.\n", hub->usb_device->ddf_dev->name, - (size_t) port); - the_port->attached_device.address = -1; - the_port->attached_device.handle = 0; - } else { - usb_log_warning("Device removed before being registered.\n"); - - /* - * Device was removed before port reset completed. - * We will announce a failed port reset to unblock the - * port reset callback from new device wrapper. - */ - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = false; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); - } - - fibril_mutex_unlock(&hub->port_mutex); -} - -/** - * Process port reset change - * - * After this change port should be enabled, unless some problem occured. - * This functions triggers second phase of enabling new device. - * @param hub - * @param port - * @param status - */ -static void usb_hub_port_reset_completed(usb_hub_info_t *hub, - uint16_t port, uint32_t status) { - usb_log_debug("Port %zu reset complete.\n", (size_t) port); - if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) { - /* Finalize device adding. */ - usb_hub_port_t *the_port = hub->ports + port; - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = true; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); - } else { - usb_log_warning( - "Port %zu reset complete but port not enabled.\n", - (size_t) port); - } - /* Clear the port reset change. */ - int rc = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_RESET); - if (rc != EOK) { - usb_log_error("Failed to clear port %d reset feature: %s.\n", - port, str_error(rc)); - } -} - -/** - * Process over current condition on port. - * - * Turn off the power on the port. - * - * @param hub hub representation - * @param port port number, starting from 1 - */ -static void usb_hub_port_over_current(usb_hub_info_t *hub, - uint16_t port, uint32_t status) { - int opResult; - if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_OVER_CURRENT)) { - opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_error("Cannot power off port %d; %s\n", - port, str_error(opResult)); - } - } else { - opResult = usb_hub_set_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_error("Cannot power on port %d; %s\n", - port, str_error(opResult)); - } - } -} - -/** Retrieve port status. - * - * @param[in] ctrl_pipe Control pipe to use. - * @param[in] port Port number (starting at 1). - * @param[out] status Where to store the port status. - * @return Error code. - */ -static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port, - usb_port_status_t *status) { - size_t recv_size; - usb_device_request_setup_packet_t request; - usb_port_status_t status_tmp; - - usb_hub_set_port_status_request(&request, port); - int rc = usb_pipe_control_read(ctrl_pipe, - &request, sizeof (usb_device_request_setup_packet_t), - &status_tmp, sizeof (status_tmp), &recv_size); - if (rc != EOK) { - return rc; - } - - if (recv_size != sizeof (status_tmp)) { - return ELIMIT; - } - - if (status != NULL) { - *status = status_tmp; - } - - return EOK; -} - -/** Callback for enabling a specific port. - * - * We wait on a CV until port is reseted. - * That is announced via change on interrupt pipe. - * - * @param port_no Port number (starting at 1). - * @param arg Custom argument, points to @c usb_hub_info_t. - * @return Error code. - */ -static int enable_port_callback(int port_no, void *arg) { - usb_hub_info_t *hub = arg; - int rc; - usb_device_request_setup_packet_t request; - usb_hub_port_t *my_port = hub->ports + port_no; - - usb_hub_set_reset_port_request(&request, port_no); - rc = usb_pipe_control_write(hub->control_pipe, - &request, sizeof (request), NULL, 0); - if (rc != EOK) { - usb_log_warning("Port reset failed: %s.\n", str_error(rc)); - return rc; - } - - /* - * Wait until reset completes. - */ - fibril_mutex_lock(&my_port->reset_mutex); - while (!my_port->reset_completed) { - fibril_condvar_wait(&my_port->reset_cv, &my_port->reset_mutex); - } - fibril_mutex_unlock(&my_port->reset_mutex); - - if (my_port->reset_okay) { - return EOK; - } else { - return ESTALL; - } -} - -/** Fibril for adding a new device. - * - * Separate fibril is needed because the port reset completion is announced - * via interrupt pipe and thus we cannot block here. - * - * @param arg Pointer to struct add_device_phase1. - * @return 0 Always. - */ -static int add_device_phase1_worker_fibril(void *arg) { - struct add_device_phase1 *data - = (struct add_device_phase1 *) arg; - - usb_address_t new_address; - devman_handle_t child_handle; - - int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev, - &data->hub->connection, data->speed, - enable_port_callback, (int) data->port, data->hub, - &new_address, &child_handle, - NULL, NULL, NULL); - - if (rc != EOK) { - usb_log_error("Failed registering device on port %zu: %s.\n", - data->port, str_error(rc)); - goto leave; - } - - fibril_mutex_lock(&data->hub->port_mutex); - data->hub->ports[data->port].attached_device.handle = child_handle; - data->hub->ports[data->port].attached_device.address = new_address; - fibril_mutex_unlock(&data->hub->port_mutex); - - usb_log_info("Detected new device on `%s' (port %zu), " - "address %d (handle %" PRIun ").\n", - data->hub->usb_device->ddf_dev->name, data->port, - new_address, child_handle); - -leave: - free(arg); - - fibril_mutex_lock(&data->hub->pending_ops_mutex); - assert(data->hub->pending_ops_count > 0); - data->hub->pending_ops_count--; - fibril_condvar_signal(&data->hub->pending_ops_cv); - fibril_mutex_unlock(&data->hub->pending_ops_mutex); - - - return EOK; -} - -/** Start device adding when connection change is detected. - * - * This fires a new fibril to complete the device addition. - * - * @param hub Hub where the change occured. - * @param port Port index (starting at 1). - * @param speed Speed of the device. - * @return Error code. - */ -static int create_add_device_fibril(usb_hub_info_t *hub, size_t port, - usb_speed_t speed) { - struct add_device_phase1 *data - = malloc(sizeof (struct add_device_phase1)); - if (data == NULL) { - return ENOMEM; - } - data->hub = hub; - data->port = port; - data->speed = speed; - - usb_hub_port_t *the_port = hub->ports + port; - - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = false; - fibril_mutex_unlock(&the_port->reset_mutex); - - int rc = usb_hub_clear_port_feature(hub->control_pipe, port, - USB_HUB_FEATURE_C_PORT_CONNECTION); - if (rc != EOK) { - free(data); - usb_log_warning("Failed to clear port change flag: %s.\n", - str_error(rc)); - return rc; - } - - fid_t fibril = fibril_create(add_device_phase1_worker_fibril, data); - if (fibril == 0) { - free(data); - return ENOMEM; - } - fibril_mutex_lock(&hub->pending_ops_mutex); - hub->pending_ops_count++; - fibril_mutex_unlock(&hub->pending_ops_mutex); - fibril_add_ready(fibril); - - return EOK; -} - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/ports.h =================================================================== --- uspace/drv/bus/usb/usbhub/ports.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,80 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * 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 drvusbhub - * @{ - */ -/** @file - * Hub ports related functions. - */ -#ifndef DRV_USBHUB_PORTS_H -#define DRV_USBHUB_PORTS_H - -#include -#include - -typedef struct usb_hub_info_t usb_hub_info_t; - -/** Information about single port on a hub. */ -typedef struct { - /** Mutex needed by CV for checking port reset. */ - fibril_mutex_t reset_mutex; - /** CV for waiting to port reset completion. */ - fibril_condvar_t reset_cv; - /** Whether port reset is completed. - * Guarded by @c reset_mutex. - */ - bool reset_completed; - /** Whether to announce the port reset as successful. */ - bool reset_okay; - - /** Information about attached device. */ - usb_hc_attached_device_t attached_device; -} usb_hub_port_t; - -/** Initialize hub port information. - * - * @param port Port to be initialized. - */ -static inline void usb_hub_port_init(usb_hub_port_t *port) { - port->attached_device.address = -1; - port->attached_device.handle = 0; - fibril_mutex_initialize(&port->reset_mutex); - fibril_condvar_initialize(&port->reset_cv); -} - - -void usb_hub_process_port_interrupt(usb_hub_info_t *hub, - uint16_t port); - - - -#endif -/** - * @} - */ Index: uspace/drv/bus/usb/usbhub/status.h =================================================================== --- uspace/drv/bus/usb/usbhub/status.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) +++ uspace/drv/bus/usb/usbhub/status.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2010 Matus Dekanek + * Copyright (c) 2011 Jan Vesely + * 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 drvusbhub + * @{ + */ + +#ifndef HUB_STATUS_H +#define HUB_STATUS_H + +#include +#include +#include + +/** + * structure holding port status and changes flags. + * should not be accessed directly, use supplied getter/setter methods. + * + * For more information refer to table 11-15 in + * "Universal Serial Bus Specification Revision 1.1" + * + */ +typedef uint32_t usb_port_status_t; +#define USB_HUB_PORT_STATUS_CONNECTION \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_CONNECTION))) +#define USB_HUB_PORT_STATUS_ENABLED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_ENABLE))) +#define USB_HUB_PORT_STATUS_SUSPEND \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_SUSPEND))) +#define USB_HUB_PORT_STATUS_OC \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_OVER_CURRENT))) +#define USB_HUB_PORT_STATUS_RESET \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_RESET))) +#define USB_HUB_PORT_STATUS_POWER \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_POWER))) +#define USB_HUB_PORT_STATUS_LOW_SPEED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_LOW_SPEED))) +#define USB_HUB_PORT_STATUS_HIGH_SPEED \ + (uint32_usb2host(1 << 10)) + +#define USB_HUB_PORT_C_STATUS_CONNECTION \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_CONNECTION))) +#define USB_HUB_PORT_C_STATUS_ENABLED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_ENABLE))) +#define USB_HUB_PORT_C_STATUS_SUSPEND \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_SUSPEND))) +#define USB_HUB_PORT_C_STATUS_OC \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_OVER_CURRENT))) +#define USB_HUB_PORT_C_STATUS_RESET \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_RESET))) + +/** + * structure holding hub status and changes flags. + * + * For more information refer to table 11.16.2.5 in + * "Universal Serial Bus Specification Revision 1.1" + * + */ +typedef uint32_t usb_hub_status_t; +#define USB_HUB_STATUS_OVER_CURRENT \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_OVER_CURRENT))) +#define USB_HUB_STATUS_LOCAL_POWER \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_LOCAL_POWER))) + +#define USB_HUB_STATUS_C_OVER_CURRENT \ + (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT))) +#define USB_HUB_STATUS_C_LOCAL_POWER \ + (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER))) + + +/** + * speed getter for port status + * + * @param status + * @return speed of usb device (for more see usb specification) + */ +static inline usb_speed_t usb_port_speed(usb_port_status_t status) +{ + if ((status & USB_HUB_PORT_STATUS_LOW_SPEED) != 0) + return USB_SPEED_LOW; + if ((status & USB_HUB_PORT_STATUS_HIGH_SPEED) != 0) + return USB_SPEED_HIGH; + return USB_SPEED_FULL; +} + +#endif /* HUB_STATUS_H */ +/** + * @} + */ Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Matus Dekanek + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -38,6 +39,10 @@ #include #include - -#include +#include + +#include +#include +#include +#include #include #include @@ -46,72 +51,67 @@ #include #include -#include +#include #include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" -#include -#include -#include - - +#include "status.h" + +#define HUB_FNC_NAME "hub" + +/** Standard get hub global status request */ +static const usb_device_request_setup_packet_t get_hub_status_request = { + .request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS, + .request = USB_HUB_REQUEST_GET_STATUS, + .index = 0, + .value = 0, + .length = sizeof(usb_hub_status_t), +}; + +static int usb_set_first_configuration(usb_device_t *usb_device); static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev); - static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info); - -static int usb_hub_set_configuration(usb_hub_info_t *hub_info); - -static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info); - -static int usb_process_hub_over_current(usb_hub_info_t *hub_info, +static void usb_hub_over_current(const usb_hub_info_t *hub_info, usb_hub_status_t status); - -static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info, - usb_hub_status_t status); - -static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info); - +static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info); static void usb_hub_polling_terminated_callback(usb_device_t *device, bool was_error, void *data); - -//********************************************* -// -// hub driver code, initialization -// -//********************************************* - /** * Initialize hub device driver fibril * - * Creates hub representation and fibril that periodically checks hub`s status. + * Creates hub representation and fibril that periodically checks hub's status. * Hub representation is passed to the fibril. * @param usb_dev generic usb device information * @return error code */ -int usb_hub_add_device(usb_device_t *usb_dev) { - if (!usb_dev) return EINVAL; +int usb_hub_add_device(usb_device_t *usb_dev) +{ + assert(usb_dev); + /* Create driver soft-state structure */ usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev); - //create hc connection + if (hub_info == NULL) { + usb_log_error("Failed to create hun driver structure.\n"); + return ENOMEM; + } + + /* Create hc connection */ usb_log_debug("Initializing USB wire abstraction.\n"); int opResult = usb_hc_connection_initialize_from_device( - &hub_info->connection, - hub_info->usb_device->ddf_dev); - if (opResult != EOK) { - usb_log_error("Could not initialize connection to device, " - " %s\n", - str_error(opResult)); - free(hub_info); - return opResult; - } - - //set hub configuration - opResult = usb_hub_set_configuration(hub_info); - if (opResult != EOK) { - usb_log_error("Could not set hub configuration, %s\n", - str_error(opResult)); - free(hub_info); - return opResult; - } + &hub_info->connection, hub_info->usb_device->ddf_dev); + if (opResult != EOK) { + usb_log_error("Could not initialize connection to device: %s\n", + str_error(opResult)); + free(hub_info); + return opResult; + } + + /* Set hub's first configuration. (There should be only one) */ + opResult = usb_set_first_configuration(usb_dev); + if (opResult != EOK) { + usb_log_error("Could not set hub configuration: %s\n", + str_error(opResult)); + free(hub_info); + return opResult; + } + //get port count and create attached_devs opResult = usb_hub_process_hub_specific_info(hub_info); @@ -123,19 +123,38 @@ } - usb_log_debug("Creating 'hub' function in DDF.\n"); + usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n"); ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev, - fun_exposed, "hub"); - assert(hub_fun != NULL); - hub_fun->ops = NULL; + fun_exposed, HUB_FNC_NAME); + if (hub_fun == NULL) { + usb_log_error("Failed to create hub function.\n"); + free(hub_info); + return ENOMEM; + } opResult = ddf_fun_bind(hub_fun); - assert(opResult == EOK); - - opResult = usb_hub_start_hub_fibril(hub_info); - if (opResult != EOK) - free(hub_info); - return opResult; -} - + if (opResult != EOK) { + usb_log_error("Failed to bind hub function: %s.\n", + str_error(opResult)); + free(hub_info); + ddf_fun_destroy(hub_fun); + return opResult; + } + + opResult = usb_device_auto_poll(hub_info->usb_device, 0, + hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, + usb_hub_polling_terminated_callback, hub_info); + if (opResult != EOK) { + ddf_fun_destroy(hub_fun); + free(hub_info); + usb_log_error("Failed to create polling fibril: %s.\n", + str_error(opResult)); + return opResult; + } + usb_log_info("Controlling hub '%s' (%zu ports).\n", + hub_info->usb_device->ddf_dev->name, hub_info->port_count); + + return EOK; +} +/*----------------------------------------------------------------------------*/ /** Callback for polling hub for changes. * @@ -147,40 +166,32 @@ */ bool hub_port_changes_callback(usb_device_t *dev, - uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) { + uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) +{ usb_log_debug("hub_port_changes_callback\n"); - usb_hub_info_t *hub = (usb_hub_info_t *) arg; - - /* FIXME: check that we received enough bytes. */ + usb_hub_info_t *hub = arg; + assert(hub); + + /* It is an error condition if we didn't receive enough data */ if (change_bitmap_size == 0) { - goto leave; - } - - bool change; - change = ((uint8_t*) change_bitmap)[0] & 1; + return false; + } + + /* Lowest bit indicates global change */ + const bool change = change_bitmap[0] & 1; if (change) { - usb_hub_process_global_interrupt(hub); - } - - size_t port; - for (port = 1; port < hub->port_count + 1; port++) { - bool change = (change_bitmap[port / 8] >> (port % 8)) % 2; + usb_hub_global_interrupt(hub); + } + + /* N + 1 bit indicates change on port N */ + size_t port = 1; + for (; port < hub->port_count + 1; port++) { + const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1; if (change) { - usb_hub_process_port_interrupt(hub, port); + usb_hub_port_process_interrupt(&hub->ports[port], hub); } } -leave: - /* FIXME: proper interval. */ - async_usleep(1000 * 250); - return true; } - - -//********************************************* -// -// support functions -// -//********************************************* - +/*----------------------------------------------------------------------------*/ /** * create usb_hub_info_t structure @@ -190,45 +201,46 @@ * @return basic usb_hub_info_t structure */ -static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) { - usb_hub_info_t * result = malloc(sizeof (usb_hub_info_t)); - if (!result) return NULL; - result->usb_device = usb_dev; - result->status_change_pipe = usb_dev->pipes[0].pipe; - result->control_pipe = &usb_dev->ctrl_pipe; - result->is_default_address_used = false; - - result->ports = NULL; - result->port_count = (size_t) - 1; - fibril_mutex_initialize(&result->port_mutex); - - fibril_mutex_initialize(&result->pending_ops_mutex); - fibril_condvar_initialize(&result->pending_ops_cv); - result->pending_ops_count = 0; - return result; -} - +static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) +{ + assert(usb_dev); + usb_hub_info_t *info = malloc(sizeof(usb_hub_info_t)); + if (!info) + return NULL; + + info->usb_device = usb_dev; + + info->ports = NULL; + info->port_count = -1; + fibril_mutex_initialize(&info->pending_ops_mutex); + fibril_condvar_initialize(&info->pending_ops_cv); + info->pending_ops_count = 0; + + return info; +} +/*----------------------------------------------------------------------------*/ /** * Load hub-specific information into hub_info structure and process if needed * - * Particularly read port count and initialize structure holding port - * information. If there are non-removable devices, start initializing them. + * Read port count and initialize structures holding per port information. + * If there are any non-removable devices, start initializing them. * This function is hub-specific and should be run only after the hub is - * configured using usb_hub_set_configuration function. + * configured using usb_set_first_configuration function. * @param hub_info hub representation * @return error code */ -int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info) -{ - // get hub descriptor +static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info) +{ + assert(hub_info); + + /* Get hub descriptor. */ usb_log_debug("Retrieving descriptor\n"); - uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE]; - int opResult; - + usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe; + + usb_hub_descriptor_header_t descriptor; size_t received_size; - opResult = usb_request_get_descriptor(hub_info->control_pipe, + int opResult = usb_request_get_descriptor(control_pipe, USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, - USB_DESCTYPE_HUB, 0, 0, serialized_descriptor, - USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size); - + USB_DESCTYPE_HUB, 0, 0, &descriptor, + sizeof(usb_hub_descriptor_t), &received_size); if (opResult != EOK) { usb_log_error("Failed to receive hub descriptor: %s.\n", @@ -236,16 +248,9 @@ return opResult; } - usb_log_debug2("Parsing descriptor\n"); - usb_hub_descriptor_t descriptor; - opResult = usb_deserialize_hub_desriptor( - serialized_descriptor, received_size, &descriptor); - if (opResult != EOK) { - usb_log_error("Could not parse descriptor: %s\n", - str_error(opResult)); - return opResult; - } - usb_log_debug("Setting port count to %d.\n", descriptor.ports_count); - hub_info->port_count = descriptor.ports_count; - + + usb_log_debug("Setting port count to %d.\n", descriptor.port_count); + hub_info->port_count = descriptor.port_count; + + // TODO: +1 hack is no longer necessary hub_info->ports = malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1)); @@ -256,19 +261,18 @@ size_t port; for (port = 0; port < hub_info->port_count + 1; ++port) { - usb_hub_port_init(&hub_info->ports[port]); + usb_hub_port_init(&hub_info->ports[port], port, control_pipe); } const bool is_power_switched = - !(descriptor.hub_characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG); + !(descriptor.characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG); if (is_power_switched) { usb_log_debug("Hub power switched\n"); - const bool per_port_power = descriptor.hub_characteristics + const bool per_port_power = descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG; for (port = 1; port <= hub_info->port_count; ++port) { usb_log_debug("Powering port %zu.\n", port); - opResult = usb_hub_set_port_feature( - hub_info->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); + opResult = usb_hub_port_set_feature( + &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER); if (opResult != EOK) { usb_log_error("Cannot power on port %zu: %s.\n", @@ -283,85 +287,52 @@ } } - } else { - usb_log_debug("Power not switched, not going to be powered\n"); + usb_log_debug("Power not switched, ports always powered\n"); } return EOK; } - -/** - * Set configuration of hub +/*----------------------------------------------------------------------------*/ +/** + * Set configuration of and USB device * * Check whether there is at least one configuration and sets the first one. * This function should be run prior to running any hub-specific action. - * @param hub_info hub representation + * @param usb_device usb device representation * @return error code */ -static int usb_hub_set_configuration(usb_hub_info_t *hub_info) { - //device descriptor - usb_standard_device_descriptor_t *std_descriptor - = &hub_info->usb_device->descriptors.device; - usb_log_debug("Hub has %d configurations\n", - std_descriptor->configuration_count); - if (std_descriptor->configuration_count < 1) { +static int usb_set_first_configuration(usb_device_t *usb_device) +{ + assert(usb_device); + /* Get number of possible configurations from device descriptor */ + const size_t configuration_count = + usb_device->descriptors.device.configuration_count; + usb_log_debug("Hub has %zu configurations.\n", configuration_count); + + if (configuration_count < 1) { usb_log_error("There are no configurations available\n"); return EINVAL; } + // TODO: Make sure that there is enough data and the cast is correct usb_standard_configuration_descriptor_t *config_descriptor = (usb_standard_configuration_descriptor_t *) - hub_info->usb_device->descriptors.configuration; - - /* Set configuration. */ - int opResult = usb_request_set_configuration( - &hub_info->usb_device->ctrl_pipe, - config_descriptor->configuration_number); - + usb_device->descriptors.configuration; + + /* Set configuration. Use the configuration that was in + * usb_device->descriptors.configuration i.e. The first one. */ + const int opResult = usb_request_set_configuration( + &usb_device->ctrl_pipe, config_descriptor->configuration_number); if (opResult != EOK) { usb_log_error("Failed to set hub configuration: %s.\n", str_error(opResult)); - return opResult; - } - usb_log_debug("\tUsed configuration %d\n", - config_descriptor->configuration_number); - - return EOK; -} - -/** - * create and start fibril with hub control loop - * - * Before the fibril is started, the control pipe and host controller - * connection of the hub is open. - * - * @param hub_info hub representing structure - * @return error code - */ -static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info) { - int rc; - - rc = usb_device_auto_poll(hub_info->usb_device, 0, - hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, - usb_hub_polling_terminated_callback, hub_info); - if (rc != EOK) { - usb_log_error("Failed to create polling fibril: %s.\n", - str_error(rc)); - free(hub_info); - return rc; - } - - usb_log_info("Controlling hub `%s' (%zu ports).\n", - hub_info->usb_device->ddf_dev->name, hub_info->port_count); - return EOK; -} - -//********************************************* -// -// change handling functions -// -//********************************************* - -/** - * process hub over current change + } else { + usb_log_debug("\tUsed configuration %d\n", + config_descriptor->configuration_number); + } + return opResult; +} +/*----------------------------------------------------------------------------*/ +/** + * Process hub over current change * * This means either to power off the hub or power it on. @@ -370,82 +341,57 @@ * @return error code */ -static int usb_process_hub_over_current(usb_hub_info_t *hub_info, - usb_hub_status_t status) { - int opResult; - if (usb_hub_is_status(status, USB_HUB_FEATURE_HUB_OVER_CURRENT)) { - //poweroff all ports - unsigned int port; +static void usb_hub_over_current(const usb_hub_info_t *hub_info, + usb_hub_status_t status) +{ + if (status & USB_HUB_STATUS_OVER_CURRENT) { + /* Hub should remove power from all ports if it detects OC */ + usb_log_warning("Detected hub over-current condition, " + "all ports should be powered off."); + } else { + /* Over-current condition is gone, it is safe to turn the + * ports on. */ + size_t port; for (port = 1; port <= hub_info->port_count; ++port) { - opResult = usb_hub_clear_port_feature( - hub_info->control_pipe, port, - USB_HUB_FEATURE_PORT_POWER); + const int opResult = usb_hub_port_set_feature( + &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER); if (opResult != EOK) { usb_log_warning( - "Cannot power off port %d; %s\n", + "HUB OVER-CURRENT GONE: Cannot power on " + "port %zu; %s\n", port, str_error(opResult)); } } - } else { - //power all ports - unsigned int port; - for (port = 1; port <= hub_info->port_count; ++port) { - opResult = usb_hub_set_port_feature( - hub_info->control_pipe, port, - USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_warning( - "Cannot power off port %d; %s\n", - port, str_error(opResult)); - } - } - } - return opResult; -} - -/** - * process hub local power change - * - * This change is ignored. + } + const int opResult = usb_request_clear_feature( + &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS, + USB_REQUEST_RECIPIENT_DEVICE, + USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0); + if (opResult != EOK) { + usb_log_error( + "Failed to clear hub over-current change flag: %s.\n", + str_error(opResult)); + } +} +/*----------------------------------------------------------------------------*/ +/** + * Process hub interrupts. + * + * The change can be either in the over-current condition or local-power change. * @param hub_info hub instance - * @param status hub status bitmask - * @return error code - */ -static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info, - usb_hub_status_t status) { - int opResult = EOK; - opResult = usb_hub_clear_feature(hub_info->control_pipe, - USB_HUB_FEATURE_C_HUB_LOCAL_POWER); - if (opResult != EOK) { - usb_log_error("Cannnot clear hub power change flag: " - "%s\n", - str_error(opResult)); - } - return opResult; -} - -/** - * process hub interrupts - * - * The change can be either in the over-current condition or - * local-power change. - * @param hub_info hub instance - */ -static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info) { + */ +static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info) +{ + assert(hub_info); + assert(hub_info->usb_device); usb_log_debug("Global interrupt on a hub\n"); - usb_pipe_t *pipe = hub_info->control_pipe; - int opResult; - - usb_port_status_t status; + usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe; + + usb_hub_status_t status; size_t rcvd_size; - usb_device_request_setup_packet_t request; - //int opResult; - usb_hub_set_hub_status_request(&request); - //endpoint 0 - - opResult = usb_pipe_control_read( - pipe, - &request, sizeof (usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + /* NOTE: We can't use standard USB GET_STATUS request, because + * hubs reply is 4byte instead of 2 */ + const int opResult = usb_pipe_control_read(control_pipe, + &get_hub_status_request, sizeof(get_hub_status_request), + &status, sizeof(usb_hub_status_t), &rcvd_size); if (opResult != EOK) { usb_log_error("Could not get hub status: %s\n", @@ -453,19 +399,40 @@ return; } - if (rcvd_size != sizeof (usb_port_status_t)) { + if (rcvd_size != sizeof(usb_hub_status_t)) { usb_log_error("Received status has incorrect size\n"); return; } - //port reset - if ( - usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT)) { - usb_process_hub_over_current(hub_info, status); - } - if ( - usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) { - usb_process_hub_local_power_change(hub_info, status); - } -} - + + /* Handle status changes */ + if (status & USB_HUB_STATUS_C_OVER_CURRENT) { + usb_hub_over_current(hub_info, status); + } + + if (status & USB_HUB_STATUS_C_LOCAL_POWER) { + /* NOTE: Handling this is more complicated. + * If the transition is from bus power to local power, all + * is good and we may signal the parent hub that we don't + * need the power. + * If the transition is from local power to bus power + * the hub should turn off all the ports and devices need + * to be reinitialized taking into account the limited power + * that is now available. + * There is no support for power distribution in HelenOS, + * (or other OSes/hub devices that I've seen) so this is not + * implemented. + * Just ACK the change. + */ + const int opResult = usb_request_clear_feature( + control_pipe, USB_REQUEST_TYPE_CLASS, + USB_REQUEST_RECIPIENT_DEVICE, + USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0); + if (opResult != EOK) { + usb_log_error( + "Failed to clear hub power change flag: %s.\n", + str_error(opResult)); + } + } +} +/*----------------------------------------------------------------------------*/ /** * callback called from hub polling fibril when the fibril terminates @@ -477,6 +444,7 @@ */ static void usb_hub_polling_terminated_callback(usb_device_t *device, - bool was_error, void *data) { - usb_hub_info_t * hub = data; + bool was_error, void *data) +{ + usb_hub_info_t *hub = data; assert(hub); @@ -492,15 +460,8 @@ */ if (hub->pending_ops_count > 0) { - fibril_mutex_lock(&hub->port_mutex); size_t port; for (port = 0; port < hub->port_count; port++) { - usb_hub_port_t *the_port = hub->ports + port; - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = false; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); + usb_hub_port_reset_fail(&hub->ports[port]); } - fibril_mutex_unlock(&hub->port_mutex); } /* And now wait for them. */ @@ -516,8 +477,4 @@ free(hub); } - - - - /** * @} Index: uspace/drv/bus/usb/usbhub/usbhub.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/usbhub/usbhub.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2011 Vojtech Horky * All rights reserved. * @@ -26,5 +27,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbhub * @{ @@ -49,5 +49,5 @@ #define NAME "usbhub" -#include "ports.h" +#include "port.h" /** Information about attached hub. */ @@ -56,37 +56,12 @@ size_t port_count; - /** attached device handles, for each port one */ + /** Attached device handles, for each port one */ usb_hub_port_t *ports; - fibril_mutex_t port_mutex; - - /** connection to hcd */ + /** Connection to hcd */ usb_hc_connection_t connection; - /** default address is used indicator - * - * If default address is requested by this device, it cannot - * be requested by the same hub again, otherwise a deadlock will occur. - */ - bool is_default_address_used; - - /** convenience pointer to status change pipe - * - * Status change pipe is initialized in usb_device structure. This is - * pointer into this structure, so that it does not have to be - * searched again and again for the 'right pipe'. - */ - usb_pipe_t * status_change_pipe; - - /** convenience pointer to control pipe - * - * Control pipe is initialized in usb_device structure. This is - * pointer into this structure, so that it does not have to be - * searched again and again for the 'right pipe'. - */ - usb_pipe_t * control_pipe; - - /** generic usb device data*/ - usb_device_t * usb_device; + /** Generic usb device data*/ + usb_device_t *usb_device; /** Number of pending operations on the mutex to prevent shooting @@ -101,5 +76,4 @@ /** Condition variable for pending_ops_count. */ fibril_condvar_t pending_ops_cv; - }; Index: pace/drv/bus/usb/usbhub/usbhub_private.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub_private.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,181 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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 drvusbhub - * @{ - */ -/** @file - * @brief Hub driver private definitions - */ - -#ifndef USBHUB_PRIVATE_H -#define USBHUB_PRIVATE_H - -#include "usbhub.h" - -#include -#include -#include -#include - -#include -#include -#include -#include - -//************ -// -// convenience define for malloc -// -//************ - - -usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device); - -/** - * Set the device request to be a get hub descriptor request. - * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE - * @param request - * @param addr - */ -static inline void usb_hub_set_descriptor_request( - usb_device_request_setup_packet_t * request - ) { - request->index = 0; - request->request_type = USB_HUB_REQ_TYPE_GET_DESCRIPTOR; - request->request = USB_HUB_REQUEST_GET_DESCRIPTOR; - request->value_high = USB_DESCTYPE_HUB; - request->value_low = 0; - request->length = USB_HUB_MAX_DESCRIPTOR_SIZE; -} - -/** - * Clear feature on hub port. - * - * @param hc Host controller telephone - * @param address Hub address - * @param port_index Port - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_clear_port_feature(usb_pipe_t *pipe, - int port_index, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE, - .request = USB_DEVREQ_CLEAR_FEATURE, - .length = 0, - .index = port_index - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param hc Host controller telephone - * @param address Hub address - * @param port_index Port - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_set_port_feature(usb_pipe_t *pipe, - int port_index, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE, - .request = USB_DEVREQ_SET_FEATURE, - .length = 0, - .index = port_index - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param pipe pipe to hub control endpoint - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_clear_feature(usb_pipe_t *pipe, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE, - .request = USB_DEVREQ_CLEAR_FEATURE, - .length = 0, - .index = 0 - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param pipe pipe to hub control endpoint - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_set_feature(usb_pipe_t *pipe, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE, - .request = USB_DEVREQ_SET_FEATURE, - .length = 0, - .index = 0 - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - - -void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor); - -void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor, - void * serialized_descriptor); - -int usb_deserialize_hub_desriptor( - void *serialized_descriptor, size_t size, usb_hub_descriptor_t *descriptor); - - -#endif /* USBHUB_PRIVATE_H */ - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/utils.c =================================================================== --- uspace/drv/bus/usb/usbhub/utils.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,155 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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 drvusbhub - * @{ - */ -/** @file - * @brief various utilities - */ -#include -#include -#include - -#include -#include -#include - -#include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" - - -size_t USB_HUB_MAX_DESCRIPTOR_SIZE = 71; - -//********************************************* -// -// various utils -// -//********************************************* - -//hub descriptor utils - -/** - * create uint8_t array with serialized descriptor - * - * @param descriptor - * @return newly created serializd descriptor pointer - */ -void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor) { - //base size - size_t size = 7; - //variable size according to port count - size_t var_size = (descriptor->ports_count + 7) / 8; - size += 2 * var_size; - uint8_t * result = malloc(size); - //size - if (result) - usb_serialize_hub_descriptor(descriptor, result); - return result; -} - -/** - * serialize descriptor into given buffer - * - * The buffer size is not checked. - * @param descriptor - * @param serialized_descriptor - */ -void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor, - void * serialized_descriptor) { - //base size - uint8_t * sdescriptor = serialized_descriptor; - size_t size = 7; - //variable size according to port count - size_t var_size = (descriptor->ports_count + 7) / 8; - size += 2 * var_size; - //size - sdescriptor[0] = size; - //descriptor type - sdescriptor[1] = USB_DESCTYPE_HUB; - sdescriptor[2] = descriptor->ports_count; - /// @fixme handling of endianness?? - sdescriptor[3] = descriptor->hub_characteristics / 256; - sdescriptor[4] = descriptor->hub_characteristics % 256; - sdescriptor[5] = descriptor->pwr_on_2_good_time; - sdescriptor[6] = descriptor->current_requirement; - - size_t i; - for (i = 0; i < var_size; ++i) { - sdescriptor[7 + i] = descriptor->devices_removable[i]; - } - for (i = 0; i < var_size; ++i) { - sdescriptor[7 + var_size + i] = 255; - } -} - -/*----------------------------------------------------------------------------*/ -/** - * Deserialize descriptor into given pointer - * - * @param serialized_descriptor - * @param descriptor - * @return - */ -int usb_deserialize_hub_desriptor( - void *serialized_descriptor, size_t size, usb_hub_descriptor_t *descriptor) -{ - uint8_t * sdescriptor = serialized_descriptor; - - if (sdescriptor[1] != USB_DESCTYPE_HUB) { - usb_log_error("Trying to deserialize wrong descriptor %x\n", - sdescriptor[1]); - return EINVAL; - } - if (size < 7) { - usb_log_error("Serialized descriptor too small.\n"); - return EOVERFLOW; - } - - descriptor->ports_count = sdescriptor[2]; - descriptor->hub_characteristics = sdescriptor[3] + 256 * sdescriptor[4]; - descriptor->pwr_on_2_good_time = sdescriptor[5]; - descriptor->current_requirement = sdescriptor[6]; - const size_t var_size = (descriptor->ports_count + 7) / 8; - //descriptor->devices_removable = (uint8_t*) malloc(var_size); - - if (size < (7 + var_size)) { - usb_log_error("Serialized descriptor too small.\n"); - return EOVERFLOW; - } - size_t i = 0; - for (; i < var_size; ++i) { - descriptor->devices_removable[i] = sdescriptor[7 + i]; - } - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** - * @} - */ Index: uspace/drv/bus/usb/vhc/connhost.c =================================================================== --- uspace/drv/bus/usb/vhc/connhost.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/drv/bus/usb/vhc/connhost.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -440,5 +440,7 @@ int rc = vhc_virtdev_add_transfer(vhc, transfer); if (rc != EOK) { - free(transfer->setup_buffer); + if (transfer->setup_buffer != NULL) { + free(transfer->setup_buffer); + } free(transfer); return rc; Index: pace/lib/c/Makefile.toolchain =================================================================== --- uspace/lib/c/Makefile.toolchain (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,128 +1,0 @@ -# -# Copyright (C) 2005 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. -# - -GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -arch $(CLANG_ARCH) \ - -D__$(ENDIANESS)__ - -LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a -AFLAGS = - -## Cross-toolchain prefix -# - -ifndef CROSS_PREFIX - CROSS_PREFIX = /usr/local -endif - -## Setup platform configuration -# - --include $(LIBC_PREFIX)/../../../Makefile.config --include $(LIBC_PREFIX)/../../../config.defs --include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc - -## Simple detection of the host system -# -HOST = $(shell uname) - -## On Solaris, some utilities have different names -# -ifeq ($(HOST),SunOS) - BINUTILS_PREFIX = "g" -else - BINUTILS_PREFIX = "" -endif - -## Toolchain configuration -# - -JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py - -ifeq ($(COMPILER),gcc_cross) - CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc - GCC = $(CC) - AS = $(TOOLCHAIN_DIR)/$(TARGET)-as - LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld - AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar - OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy - OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),gcc_native) - CC = gcc - GCC = $(CC) - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),icc) - CC = icc - GCC = gcc - AS = as - LD = ld - AR = ar - OBJCOPY = objcopy - OBJDUMP = objdump - CFLAGS = $(ICC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),clang) - CC = clang - GCC = gcc - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(CLANG_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif Index: pace/lib/c/arch/amd64/include/limits.h =================================================================== --- uspace/lib/c/arch/amd64/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,46 +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 libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_LIMITS_H_ -#define LIBC_amd64_LIMITS_H_ - -# define LONG_MIN MIN_INT64 -# define LONG_MAX MAX_INT64 -# define ULONG_MIN MIN_UINT64 -# define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: pace/lib/c/arch/arm32/include/limits.h =================================================================== --- uspace/lib/c/arch/arm32/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Limits declarations. - */ - -#ifndef LIBC_arm32__LIMITS_H_ -#define LIBC_arm32__LIMITS_H_ - -#define LONG_MIN MIN_INT32 -#define LONG_MAX MAX_INT32 -#define ULONG_MIN MIN_UINT32 -#define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: pace/lib/c/arch/ia32/include/limits.h =================================================================== --- uspace/lib/c/arch/ia32/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,46 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32__LIMITS_H_ -#define LIBC_ia32__LIMITS_H_ - -# define LONG_MIN MIN_INT32 -# define LONG_MAX MAX_INT32 -# define ULONG_MIN MIN_UINT32 -# define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia64/include/ddi.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/lib/c/arch/ia64/include/ddi.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -52,8 +52,12 @@ static inline void pio_write_8(ioport8_t *port, uint8_t v) { - uintptr_t prt = (uintptr_t) port; + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; - *((ioport8_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ("mf\n" ::: "memory"); @@ -62,8 +66,12 @@ static inline void pio_write_16(ioport16_t *port, uint16_t v) { - uintptr_t prt = (uintptr_t) port; + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; - *((ioport16_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ("mf\n" ::: "memory"); @@ -72,8 +80,12 @@ static inline void pio_write_32(ioport32_t *port, uint32_t v) { - uintptr_t prt = (uintptr_t) port; + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; - *((ioport32_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } asm volatile ("mf\n" ::: "memory"); @@ -82,30 +94,54 @@ static inline uint8_t pio_read_8(ioport8_t *port) { - uintptr_t prt = (uintptr_t) port; + uint8_t v; asm volatile ("mf\n" ::: "memory"); - return *((ioport8_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } static inline uint16_t pio_read_16(ioport16_t *port) { - uintptr_t prt = (uintptr_t) port; + uint16_t v; asm volatile ("mf\n" ::: "memory"); - return *((ioport16_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } static inline uint32_t pio_read_32(ioport32_t *port) { - uintptr_t prt = (uintptr_t) port; + uint32_t v; asm volatile ("mf\n" ::: "memory"); - return *((ioport32_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); + if (port < (ioport32_t *) port) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + return v; } Index: pace/lib/c/arch/ia64/include/limits.h =================================================================== --- uspace/lib/c/arch/ia64/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,46 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_LIMITS_H_ -#define LIBC_ia64_LIMITS_H_ - -# define LONG_MIN MIN_INT64 -# define LONG_MAX MAX_INT64 -# define ULONG_MIN MIN_UINT64 -# define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: pace/lib/c/arch/mips32/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,47 +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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32eb - */ - -#ifndef LIBC_mips32__LIMITS_H_ -#define LIBC_mips32__LIMITS_H_ - -# define LONG_MIN MIN_INT32 -# define LONG_MAX MAX_INT32 -# define ULONG_MIN MIN_UINT32 -# define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: pace/lib/c/arch/mips32eb/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/limits.h Index: pace/lib/c/arch/ppc32/include/limits.h =================================================================== --- uspace/lib/c/arch/ppc32/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,46 +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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_LIMITS_H_ -#define LIBC_ppc32_LIMITS_H_ - -#define LONG_MIN MIN_INT32 -#define LONG_MAX MAX_INT32 -#define ULONG_MIN MIN_UINT32 -#define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: pace/lib/c/arch/sparc64/include/limits.h =================================================================== --- uspace/lib/c/arch/sparc64/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,46 +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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_LIMITS_H_ -#define LIBC_sparc64_LIMITS_H_ - -#define LONG_MIN MIN_INT64 -#define LONG_MAX MAX_INT64 -#define ULONG_MIN MIN_UINT64 -#define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: pace/lib/c/include/limits.h =================================================================== --- uspace/lib/c/include/limits.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,74 +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 libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_LIMITS_H_ -#define LIBC_LIMITS_H_ - -#include -#include - -/* char */ -#define SCHAR_MIN MIN_INT8 -#define SCHAR_MAX MAX_INT8 -#define UCHAR_MIN MIN_UINT8 -#define UCHAR_MAX MAX_UINT8 - -#ifdef __CHAR_UNSIGNED__ -# define CHAR_MIN UCHAR_MIN -# define CHAR_MAX UCHAR_MAX -#else -# define CHAR_MIN SCHAR_MIN -# define CHAR_MAX SCHAR_MAX -#endif - -/* short int */ -#define SHRT_MIN MIN_INT16 -#define SHRT_MAX MAX_INT16 -#define USHRT_MIN MIN_UINT16 -#define USHRT_MAX MAX_UINT16 - -#define INT_MIN MIN_INT32 -#define INT_MAX MAX_INT32 -#define UINT_MIN MIN_UINT32 -#define UINT_MAX MAX_UINT32 - -#define LLONG_MIN MIN_INT64 -#define LLONG_MAX MAX_INT64 -#define ULLONG_MIN MIN_UINT64 -#define ULLONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: pace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,64 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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. -# - -## Setup toolchain -# - -include Makefile.common -include $(LIBC_PREFIX)/Makefile.toolchain - -## Sources -# - -SOURCES = \ - access.c \ - generic.c \ - names.c \ - i386-ports.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all - -all: $(LIBPCI) - --include $(DEPEND) - -$(LIBPCI): $(OBJECTS) - $(AR) rc $@ $(OBJECTS) - -%.o: %.c $(DEPEND) - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -ifeq ($(PRECHECK),y) - $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) -endif - -$(DEPEND): - makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null - -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: pace/lib/libpci/Makefile.common =================================================================== --- uspace/lib/libpci/Makefile.common (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2005 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. -# - - -## Common names -# - -LIBC_PREFIX = ../../../../../lib/libc -DEPEND = Makefile.depend -DEPEND_PREV = $(DEPEND).prev -JOB = libpci.job -LIBPCI = libpci.a Index: pace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,71 +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 net - * @{ - */ - -/** @file - * Host - network byte order manipulation functions. - */ - -#ifndef __NET_BYTEORDER_H__ -#define __NET_BYTEORDER_H__ - -#include -#include - - -/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htons(number) host2uint16_t_be(number) - -/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htonl(number) host2uint32_t_be(number) - -/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohs(number) uint16_t_be2host(number) - -/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohl(number) uint32_t_be2host(number) - -#endif - -/** @} - */ Index: pace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,99 +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 net - * @{ - */ - -/** @file - * Common error processing codes and routines. - */ - -#ifndef __NET_ERR_H__ -#define __NET_ERR_H__ - -#include - -#ifdef CONFIG_DEBUG - #include - #include -#endif - -/** An actual stored error code. - * - */ -#define ERROR_CODE error_check_return_value - -/** An error processing routines declaration. - * - * This has to be declared in the block where the error processing - * is desired. - * - */ -#define ERROR_DECLARE int ERROR_CODE - -/** Store the value as an error code and checks if an error occurred. - * - * @param[in] value The value to be checked. May be a function call. - * @return False if the value indicates success (EOK). - * @return True otherwise. - * - */ -#ifdef CONFIG_DEBUG - -#define ERROR_OCCURRED(value) \ - (((ERROR_CODE = (value)) != EOK) \ - && ({ \ - fprintf(stderr, "libsocket error at %s:%d (%s)\n", \ - __FILE__, __LINE__, str_error(ERROR_CODE)); \ - 1; \ - })) - -#else - -#define ERROR_OCCURRED(value) ((ERROR_CODE = (value)) != EOK) - -#endif - -/** Error propagation - * - * Check if an error occurred and immediately exit the actual - * function returning the error code. - * - * @param[in] value The value to be checked. May be a function call. - * - */ - -#define ERROR_PROPAGATE(value) \ - if (ERROR_OCCURRED(value)) \ - return ERROR_CODE - -#endif - -/** @} - */ Index: pace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (revision ) @@ -1,136 +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 net - * @{ - */ - -/** @file - * Socket error codes. - * Based on BSD. - */ - -#ifndef __NET_SOCKET_ERR_H__ -#define __NET_SOCKET_ERR_H__ - -#include - -/** @name Socket error codes definitions - */ -/*@{*/ - -////#define EINTR (-10004) -////#define EBADF (-10009) -//#define EACCES (-10013) -//#define EFAULT (-10014) -////#define EINVAL (-10022) -////#define EMFILE (-10024) -//#define EWOULDBLOCK (-10035) - -/** An API function is called while another blocking function is in progress. - */ -#define EINPROGRESS (-10036) - -//#define EALREADY (-10037) - -/** The socket identifier is not valid. - */ -#define ENOTSOCK (-10038) - -/** The destination address required. - */ -#define EDESTADDRREQ (-10039) - -//#define EMSGSIZE (-10040) -//#define EPROTOTYPE (-10041) -//#define ENOPROTOOPT (-10042) - -/** Protocol is not supported. - */ -#define EPROTONOSUPPORT (-10043) - -/** Socket type is not supported. - */ -#define ESOCKTNOSUPPORT (-10044) - -//#define EOPNOTSUPP (-10045) - -/** Protocol family is not supported. - */ -#define EPFNOSUPPORT (-10046) - -/** Address family is not supported. - */ -#define EAFNOSUPPORT (-10047) - -/** Address is already in use. - */ -#define EADDRINUSE (-10048) - -//#define EADDRNOTAVAIL (-10049) -/* May be reported at any time if the implementation detects an underlying failure. - */ -//#define ENETDOWN (-10050) -//#define ENETUNREACH (-10051) -//#define ENETRESET (-10052) -//#define ECONNABORTED (-10053) -//#define ECONNRESET (-10054) -//#define ENOBUFS (-10055) -//#define EISCONN (-10056) - -/** The socket is not connected or bound. - */ -#define ENOTCONN (-10057) - -//#define ESHUTDOWN (-10058) -//#define ETOOMANYREFS (-10059) -//#define ETIMEDOUT (-10060) -//#define ECONNREFUSED (-10061) -//#define ELOOP (-10062) -////#define ENAMETOOLONG (-10063) -//#define EHOSTDOWN (-10064) -//#define EHOSTUNREACH (-10065) -//#define HOST_NOT_FOUND (-11001) - -/** The requested operation was not performed. - * Try again later. - */ -#define TRY_AGAIN (-11002) - -//#define NO_RECOVERY (-11003) - -/** No data. - */ -#define NO_DATA (-11004) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/lib/usb/include/usb/classes/hub.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -72,5 +72,9 @@ uint8_t port_count; /** Characteristics bitmask. */ - uint16_t characteristics; + uint8_t characteristics; +#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) +#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) + /* Unused part of characteristics field */ + uint8_t characteristics_reserved; /** Time from power-on to stabilization of current on the port. */ uint8_t power_good_time; @@ -92,5 +96,5 @@ /** Number of downstream ports that this hub supports */ - uint8_t ports_count; + uint8_t port_count; /** @@ -119,6 +123,4 @@ */ uint16_t hub_characteristics; -#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) -#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) /** @@ -214,11 +216,6 @@ * Maximum size of usb hub descriptor in bytes */ -extern size_t USB_HUB_MAX_DESCRIPTOR_SIZE; - - - - - - +/* 7 (basic size) + 2*32 (port bitmasks) */ +#define USB_HUB_MAX_DESCRIPTOR_SIZE 71 #endif Index: uspace/lib/usbdev/include/usb/dev/pipes.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/pipes.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/lib/usbdev/include/usb/dev/pipes.h (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -183,5 +183,5 @@ int usb_pipe_write(usb_pipe_t *, void *, size_t); -int usb_pipe_control_read(usb_pipe_t *, void *, size_t, +int usb_pipe_control_read(usb_pipe_t *, const void *, size_t, void *, size_t, size_t *); int usb_pipe_control_write(usb_pipe_t *, void *, size_t, Index: uspace/lib/usbdev/src/pipesio.c =================================================================== --- uspace/lib/usbdev/src/pipesio.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/lib/usbdev/src/pipesio.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -328,5 +328,5 @@ */ static int usb_pipe_control_read_no_check(usb_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, + const void *setup_buffer, size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) { @@ -411,5 +411,5 @@ */ int usb_pipe_control_read(usb_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, + const void *setup_buffer, size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) { Index: uspace/lib/usbhid/src/hidpath.c =================================================================== --- uspace/lib/usbhid/src/hidpath.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/lib/usbhid/src/hidpath.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -76,7 +76,8 @@ int32_t usage_page, int32_t usage) { - usb_hid_report_usage_path_t *item; - - if(!(item=malloc(sizeof(usb_hid_report_usage_path_t)))) { + usb_hid_report_usage_path_t *item + = malloc(sizeof(usb_hid_report_usage_path_t)); + + if (item == NULL) { return ENOMEM; } Index: uspace/srv/fs/mfs/mfs_ops.c =================================================================== --- uspace/srv/fs/mfs/mfs_ops.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/srv/fs/mfs/mfs_ops.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -143,8 +143,8 @@ { enum cache_mode cmode; - struct mfs_superblock *sb; - struct mfs3_superblock *sb3; - struct mfs_sb_info *sbi; - struct mfs_instance *instance; + struct mfs_superblock *sb = NULL; + struct mfs3_superblock *sb3 = NULL; + struct mfs_sb_info *sbi = NULL; + struct mfs_instance *instance = NULL; bool native, longnames; mfs_version_t version; @@ -166,6 +166,6 @@ sbi = malloc(sizeof(*sbi)); if (!sbi) { - block_fini(service_id); - return ENOMEM; + rc = ENOMEM; + goto out_error; } @@ -173,26 +173,18 @@ instance = malloc(sizeof(*instance)); if (!instance) { - free(sbi); - block_fini(service_id); - return ENOMEM; + rc = ENOMEM; + goto out_error; } sb = malloc(MFS_SUPERBLOCK_SIZE); if (!sb) { - free(instance); - free(sbi); - block_fini(service_id); - return ENOMEM; + rc = ENOMEM; + goto out_error; } /* Read the superblock */ rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 2, sb); - if (rc != EOK) { - free(instance); - free(sbi); - free(sb); - block_fini(service_id); - return rc; - } + if (rc != EOK) + goto out_error; sb3 = (struct mfs3_superblock *) sb; @@ -207,9 +199,6 @@ /*Not recognized*/ mfsdebug("magic number not recognized\n"); - free(instance); - free(sbi); - free(sb); - block_fini(service_id); - return ENOTSUP; + rc = ENOTSUP; + goto out_error; } @@ -256,16 +245,24 @@ MFS_MAX_NAME_LEN; } + + if (sbi->log2_zone_size != 0) { + /* In MFS, file space is allocated per zones. + * Zones are a collection of consecutive blocks on disk. + * + * The current MFS implementation supports only filesystems + * where the size of a zone is equal to the + * size of a block. + */ + rc = ENOTSUP; + goto out_error; + } + sbi->itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks; - - free(sb); rc = block_cache_init(service_id, sbi->block_size, 0, cmode); if (rc != EOK) { - free(instance); - free(sbi); - block_cache_fini(service_id); - block_fini(service_id); mfsdebug("block cache initialization failed\n"); - return EINVAL; + rc = EINVAL; + goto out_error; } @@ -295,5 +292,17 @@ *linkcnt = 1; + free(sb); + return mfs_node_put(fn); + +out_error: + block_fini(service_id); + if (sb) + free(sb); + if (sbi) + free(sbi); + if(instance) + free(instance); + return rc; } @@ -880,6 +889,5 @@ struct mfs_ino_info *ino_i = mnode->ino_i; const size_t bs = sbi->block_size; - size_t bytes = min(len, bs - pos % bs); - size_t boundary = ROUND_UP(ino_i->i_size, bs); + size_t bytes = min(len, bs - (pos % bs)); uint32_t block; @@ -887,17 +895,10 @@ flags = BLOCK_FLAGS_NOREAD; - if (pos < boundary) { - r = mfs_read_map(&block, mnode, pos); - if (r != EOK) - goto out_err; - - if (block == 0) { - /*Writing in a sparse block*/ - r = mfs_alloc_zone(mnode->instance, &block); - if (r != EOK) - goto out_err; - flags = BLOCK_FLAGS_NOREAD; - } - } else { + r = mfs_read_map(&block, mnode, pos); + if (r != EOK) + goto out_err; + + if (block == 0) { + /*Writing in a sparse block*/ uint32_t dummy; @@ -905,8 +906,10 @@ if (r != EOK) goto out_err; - + r = mfs_write_map(mnode, pos, block, &dummy); if (r != EOK) goto out_err; + + flags = BLOCK_FLAGS_NOREAD; } @@ -916,5 +919,8 @@ goto out_err; - async_data_write_finalize(callid, b->data + pos % bs, bytes); + if (flags == BLOCK_FLAGS_NOREAD) + memset(b->data, 0, sbi->block_size); + + async_data_write_finalize(callid, b->data + (pos % bs), bytes); b->dirty = true; @@ -925,8 +931,10 @@ } - ino_i->i_size = pos + bytes; - ino_i->dirty = true; + if (pos + bytes > ino_i->i_size) { + ino_i->i_size = pos + bytes; + ino_i->dirty = true; + } r = mfs_node_put(fn); - *nsize = pos + bytes; + *nsize = ino_i->i_size; *wbytes = bytes; return r; Index: uspace/srv/fs/mfs/mfs_rw.c =================================================================== --- uspace/srv/fs/mfs/mfs_rw.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/srv/fs/mfs/mfs_rw.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -31,4 +31,5 @@ */ +#include #include "mfs.h" @@ -70,5 +71,5 @@ int rblock = pos / block_size; - if (mnode->ino_i->i_size < pos) { + if (ROUND_UP(mnode->ino_i->i_size, sbi->block_size) < pos) { /*Trying to read beyond the end of file*/ r = EOK; Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/srv/hid/console/console.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -344,4 +344,19 @@ } +static console_t *cons_get_active_uspace(void) +{ + fibril_mutex_lock(&switch_mtx); + + console_t *active_uspace = active_console; + if (active_uspace == kernel_console) { + active_uspace = prev_console; + } + assert(active_uspace != kernel_console); + + fibril_mutex_unlock(&switch_mtx); + + return active_uspace; +} + static ssize_t limit(ssize_t val, ssize_t lo, ssize_t hi) { @@ -466,5 +481,13 @@ event->c = c; - prodcons_produce(&active_console->input_pc, &event->link); + /* Kernel console does not read events + * from us, so we will redirect them + * to the (last) active userspace console + * if necessary. + */ + console_t *target_console = cons_get_active_uspace(); + + prodcons_produce(&target_console->input_pc, + &event->link); } @@ -904,4 +927,5 @@ atomic_set(&consoles[i].refcnt, 0); fibril_mutex_initialize(&consoles[i].mtx); + prodcons_initialize(&consoles[i].input_pc); if (graphics_state == GRAPHICS_FULL) { @@ -942,5 +966,4 @@ } - prodcons_initialize(&consoles[i].input_pc); cons_redraw_state(&consoles[i]); Index: pace/srv/hid/input/include/sun.h =================================================================== --- uspace/srv/hid/input/include/sun.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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 b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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 b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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 b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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 b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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: pace/srv/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ uspace/srv/hw/irc/apic/apic.c (revision 0f3744dd7382e7567de5742d4a853fc1e6c9e7ce) @@ -206,7 +206,10 @@ } - if (pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE, - (void **) &io_apic) != EOK) + int rc = pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE, + (void **) &io_apic); + if (rc != EOK) { + printf("%s: Failed to enable PIO for APIC: %d\n", NAME, rc); return false; + } async_set_client_connection(apic_connection); Index: pace/srv/hw/netif/ne2000/dp8390_drv.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_drv.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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: pace/srv/hw/netif/ne2000/dp8390_port.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_port.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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: pace/srv/hw/netif/ne2000/local.h =================================================================== --- uspace/srv/hw/netif/ne2000/local.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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: pace/srv/hw/netif/ne2000/ne2000.h =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.h (revision b69e4c0e57c95841447ac2ff2a399e6f98d04b10) +++ (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 $ - */ - -/** @} - */