Index: boot/generic/include/typedefs.h =================================================================== --- boot/generic/include/typedefs.h (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ boot/generic/include/typedefs.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -37,5 +37,5 @@ #include -#define NULL 0 +#define NULL ((void *) 0) #define false 0 Index: kernel/arch/amd64/src/debugger.c =================================================================== --- kernel/arch/amd64/src/debugger.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/arch/amd64/src/debugger.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -260,5 +260,5 @@ } - cur->address = NULL; + cur->address = (uintptr_t) NULL; setup_dr(slot); @@ -313,5 +313,5 @@ unsigned int i; for (i = 0; i < BKPOINTS_MAX; i++) - breakpoints[i].address = NULL; + breakpoints[i].address = (uintptr_t) NULL; #ifdef CONFIG_KCONSOLE Index: kernel/arch/mips32/src/debugger.c =================================================================== --- kernel/arch/mips32/src/debugger.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/arch/mips32/src/debugger.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -247,5 +247,5 @@ smc_coherence(((uint32_t *) cur->address)[1]); - cur->address = NULL; + cur->address = (uintptr_t) NULL; irq_spinlock_unlock(&bkpoint_lock, true); @@ -289,5 +289,5 @@ for (i = 0; i < BKPOINTS_MAX; i++) - breakpoints[i].address = NULL; + breakpoints[i].address = (uintptr_t) NULL; #ifdef CONFIG_KCONSOLE @@ -417,5 +417,5 @@ /* Remove one-shot breakpoint */ if ((cur->flags & BKPOINT_ONESHOT)) - cur->address = NULL; + cur->address = (uintptr_t) NULL; /* Remove in-progress flag */ Index: kernel/arch/sparc64/src/mm/sun4u/frame.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/frame.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/arch/sparc64/src/mm/sun4u/frame.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -41,5 +41,5 @@ #include -uintptr_t last_frame = NULL; +uintptr_t last_frame = (uintptr_t) NULL; /** Create memory zones according to information stored in memmap. Index: kernel/generic/include/typedefs.h =================================================================== --- kernel/generic/include/typedefs.h (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/generic/include/typedefs.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -40,5 +40,5 @@ #include -#define NULL 0UL +#define NULL ((void *) 0) #define false 0 Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/generic/src/main/main.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -97,5 +97,5 @@ /** Boot allocations. */ ballocs_t ballocs = { - .base = NULL, + .base = (uintptr_t) NULL, .size = 0 }; Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/generic/src/mm/as.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -312,5 +312,5 @@ * */ - if (overlaps(va, size, NULL, PAGE_SIZE)) + if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE)) return false; Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/generic/src/mm/frame.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -878,5 +878,5 @@ * the assert */ - ASSERT(confframe != NULL); + ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL)); /* If confframe is supposed to be inside our zone, then make sure @@ -1104,5 +1104,5 @@ */ pfn_t pfn = ADDR2PFN(frame); - size_t znum = find_zone(pfn, 1, NULL); + size_t znum = find_zone(pfn, 1, 0); ASSERT(znum != (size_t) -1); @@ -1141,5 +1141,5 @@ * First, find host frame zone for addr. */ - size_t znum = find_zone(pfn, 1, NULL); + size_t znum = find_zone(pfn, 1, 0); ASSERT(znum != (size_t) -1); Index: kernel/generic/src/synch/smc.c =================================================================== --- kernel/generic/src/synch/smc.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ kernel/generic/src/synch/smc.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -44,5 +44,5 @@ unative_t sys_smc_coherence(uintptr_t va, size_t size) { - if (overlaps(va, size, NULL, PAGE_SIZE)) + if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE)) return EINVAL; Index: uspace/app/bdsh/cmds/builtins/builtins.h =================================================================== --- uspace/app/bdsh/cmds/builtins/builtins.h (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/app/bdsh/cmds/builtins/builtins.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -10,5 +10,5 @@ #include "cd/cd_def.h" #include "exit/exit_def.h" - {NULL, NULL, NULL, NULL, NULL} + {NULL, NULL, NULL, NULL, 0} }; Index: uspace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) +++ uspace/app/netstart/self_test.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -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 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) +++ uspace/app/netstart/self_test.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -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/nettest1/nettest1.c =================================================================== --- uspace/app/nettest1/nettest1.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/app/nettest1/nettest1.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -388,5 +388,5 @@ return ENOMEM; } - socket_ids[sockets] = NULL; + socket_ids[sockets] = 0; if (verbose) Index: uspace/app/nettest2/nettest2.c =================================================================== --- uspace/app/nettest2/nettest2.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/app/nettest2/nettest2.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -336,5 +336,5 @@ return ENOMEM; } - socket_ids[sockets] = NULL; + socket_ids[sockets] = 0; if (verbose) Index: uspace/lib/c/arch/abs32le/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/abs32le/src/stacktrace.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/lib/c/arch/abs32le/src/stacktrace.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -56,10 +56,10 @@ uintptr_t stacktrace_fp_get(void) { - return NULL; + return (uintptr_t) NULL; } uintptr_t stacktrace_pc_get(void) { - return NULL; + return (uintptr_t) NULL; } Index: uspace/lib/c/arch/abs32le/src/tls.c =================================================================== --- uspace/lib/c/arch/abs32le/src/tls.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/lib/c/arch/abs32le/src/tls.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -46,5 +46,5 @@ uintptr_t __aeabi_read_tp(void) { - return NULL; + return (uintptr_t) NULL; } Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/lib/c/generic/async.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -536,5 +536,5 @@ if (callid) ipc_answer_0(callid, ENOMEM); - return NULL; + return (uintptr_t) NULL; } @@ -556,5 +556,5 @@ if (callid) ipc_answer_0(callid, ENOMEM); - return NULL; + return (uintptr_t) NULL; } Index: uspace/lib/c/generic/io/klog.c =================================================================== --- uspace/lib/c/generic/io/klog.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/lib/c/generic/io/klog.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -52,5 +52,5 @@ void klog_update(void) { - (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); + (void) __SYSCALL3(SYS_KLOG, 1, (uintptr_t) NULL, 0); } Index: uspace/lib/c/include/unistd.h =================================================================== --- uspace/lib/c/include/unistd.h (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/lib/c/include/unistd.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -41,5 +41,5 @@ #ifndef NULL - #define NULL 0UL + #define NULL ((void *) 0) #endif Index: uspace/lib/packet/include/netdb.h =================================================================== --- uspace/lib/packet/include/netdb.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) +++ uspace/lib/packet/include/netdb.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -0,0 +1,109 @@ +/* + * 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 netdb + * @{ + */ + +/** @file + * Structures and interfaces according to the BSD netdb.h file. + */ + +#ifndef __NET_NETDB_H__ +#define __NET_NETDB_H__ + +#include + +/** Structure returned by network data base library. + * All addresses are supplied in host order, and returned in network order (suitable for use in system calls). + */ +struct hostent { + /** Official host name. + */ + char * h_name; + /** Alias list. + */ + char ** h_aliases; + /** Host address type. + */ + int h_addrtype; + /** Address length. + */ + int h_length; + /** List of addresses from name server. + */ + char ** h_addr_list; + /** Address, for backward compatiblity. + */ +#define h_addr h_addr_list[0] +}; + +/** @name Host entry address types definitions. + */ +/*@{*/ + +/** Authoritative Answer Host not found address type. + */ +#define HOST_NOT_FOUND 1 + +/** Non-Authoritive Host not found, or SERVERFAIL address type. + */ +#define TRY_AGAIN 2 + +/** Non recoverable errors, FORMERR, REFUSED, NOTIMP address type. + */ +#define NO_RECOVERY 3 + +/** Valid name, no data record of requested type address type. + */ +#define NO_DATA 4 + +/** No address, look for MX record address type. + */ +#define NO_ADDRESS NO_DATA + +/*@}*/ + +/** Returns host entry by the host address. + * @param[in] address The host address. + * @param[in] len The address length. + * @param[in] type The address type. + * @returns Host entry information. + */ +//struct hostent * gethostbyaddr(const void * address, int len, int type); + +/** Returns host entry by the host name. + * @param[in] name The host name. + * @returns Host entry information. + */ +//struct hostent * gethostbyname(const char * name); + +#endif + +/** @} + */ Index: uspace/lib/packet/include/tcp_codes.h =================================================================== --- uspace/lib/packet/include/tcp_codes.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) +++ uspace/lib/packet/include/tcp_codes.h (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -0,0 +1,88 @@ +/* + * 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 tcp + * @{ + */ + +/** @file + * TCP options definitions. + */ + +#ifndef __NET_TCP_CODES_H__ +#define __NET_TCP_CODES_H__ + +/** End of list TCP option. + */ +#define TCPOPT_END_OF_LIST 0x0 + +/** No operation TCP option. + */ +#define TCPOPT_NO_OPERATION 0x1 + +/** Maximum segment size TCP option. + */ +#define TCPOPT_MAX_SEGMENT_SIZE 0x2 + +/** Maximum segment size TCP option length. + */ +#define TCPOPT_MAX_SEGMENT_SIZE_LENGTH 4 + +/** Window scale TCP option. + */ +#define TCPOPT_WINDOW_SCALE 0x3 + +/** Window scale TCP option length. + */ +#define TCPOPT_WINDOW_SCALE_LENGTH 3 + +/** Selective acknowledgement permitted TCP option. + */ +#define TCPOPT_SACK_PERMITTED 0x4 + +/** Selective acknowledgement permitted TCP option length. + */ +#define TCPOPT_SACK_PERMITTED_LENGTH 2 + +/** Selective acknowledgement TCP option. + * Has variable length. + */ +#define TCPOPT_SACK 0x5 + +/** Timestamp TCP option. + */ +#define TCPOPT_TIMESTAMP 0x8 + +/** Timestamp TCP option length. + */ +#define TCPOPT_TIMESTAMP_LENGTH 10 + +#endif + +/** @} + */ Index: uspace/srv/hid/kbd/genarch/gsp.c =================================================================== --- uspace/srv/hid/kbd/genarch/gsp.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/srv/hid/kbd/genarch/gsp.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -198,6 +198,6 @@ if (t == NULL) { printf("gsp_step: not found\n"); - *mods = NULL; - *key = NULL; + *mods = 0; + *key = 0; return 0; } Index: uspace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/srv/hw/netif/dp8390/dp8390.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -432,5 +432,5 @@ dep->de_write_iovec.iod_iovec[0].iov_size = size; dep->de_write_iovec.iod_iovec_s = 1; - dep->de_write_iovec.iod_iovec_addr = NULL; + dep->de_write_iovec.iod_iovec_addr = (uintptr_t) NULL; if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED) @@ -1015,5 +1015,5 @@ dep->de_read_iovec.iod_iovec[0].iov_size = length; dep->de_read_iovec.iod_iovec_s = 1; - dep->de_read_iovec.iod_iovec_addr = NULL; + dep->de_read_iovec.iod_iovec_addr = (uintptr_t) NULL; last = page + (length - 1) / DP_PAGESIZE; Index: uspace/srv/hw/netif/dp8390/dp8390_module.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390_module.c (revision dd5046dd1beda773c101cd57515df9157d461a36) +++ uspace/srv/hw/netif/dp8390/dp8390_module.c (revision 7e1f9b7138c76a3ff70800594a3cae2de37a1c43) @@ -127,5 +127,5 @@ dep->received_count = 0; fibril_rwlock_write_unlock(&netif_globals.lock); - nil_received_msg(phone, device_id, received, NULL); + nil_received_msg(phone, device_id, received, SERVICE_NONE); }else{ fibril_rwlock_write_unlock(&netif_globals.lock);