Changes in / [5c1b3cd:71fe7e9d] in mainline
- Files:
-
- 562 added
- 585 deleted
- 56 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r5c1b3cd r71fe7e9d 64 64 @ "gta02" GTA02 / Neo FreeRunner 65 65 @ "integratorcp" Integratorcp 66 @ "beagleboardxm" BeagleBoard-xM 67 @ "beaglebone" BeagleBone 66 @ "beagleboardxm" BeogleBoard-xM 68 67 ! [PLATFORM=arm32] MACHINE (choice) 69 68 … … 89 88 % CPU type 90 89 @ "cortex_a8" ARM Cortex A-8 91 ! [PLATFORM=arm32& (MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)90 ! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice) 92 91 93 92 % CPU type … … 442 441 % Output device class 443 442 @ "generic" Monitor or serial line 444 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm |MACHINE=beaglebone)] CONFIG_HID_OUT (choice)443 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm)] CONFIG_HID_OUT (choice) 445 444 446 445 % Output device class … … 489 488 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y) 490 489 491 % Support for TI AM335x on-chip UART 492 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n) 493 494 % Support for TI AM335x timers support 495 ! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y) 496 497 % Support for TI AMDM37x on-chip UART 490 % Support for TI AMDM37X on-chip UART 498 491 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n) 499 492 … … 517 510 518 511 % Serial line input module 519 ! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebo ne&CONFIG_AM335X_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)512 ! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) 520 513 521 514 % EGA support … … 642 635 % uImage OS type 643 636 @ "2" NetBSD stage 2 boot loader 644 ! [PLATFORM=arm32& (MACHINE=beagleboardxm|MACHINE=beaglebone)] UIMAGE_OS (choice)637 ! [PLATFORM=arm32&MACHINE=beagleboardxm] UIMAGE_OS (choice) 645 638 646 639 % uImage OS type 647 640 @ "5" Linux kernel 648 ! [PLATFORM=arm32&MACHINE!=beagleboardxm &MACHINE!=beaglebone] UIMAGE_OS (choice)641 ! [PLATFORM=arm32&MACHINE!=beagleboardxm] UIMAGE_OS (choice) -
boot/Makefile
r5c1b3cd r71fe7e9d 61 61 mkdir "$(DIST_PATH)/inc/c/" 62 62 cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/" 63 cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"64 cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"65 63 cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld" 66 64 endif -
boot/arch/arm32/Makefile.inc
r5c1b3cd r71fe7e9d 35 35 endif 36 36 37 ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))37 ifeq ($(MACHINE), beagleboardxm) 38 38 BOOT_OUTPUT = image.boot 39 39 POST_OUTPUT = $(ROOT_PATH)/uImage.bin -
boot/arch/arm32/include/arch.h
r5c1b3cd r71fe7e9d 44 44 #elif defined MACHINE_beagleboardxm 45 45 #define BOOT_BASE 0x80000000 46 #elif defined MACHINE_beaglebone47 #define BOOT_BASE 0x8000000048 46 #else 49 47 #define BOOT_BASE 0x00000000 … … 53 51 54 52 #ifdef MACHINE_beagleboardxm 55 #define PA_OFFSET 056 #elif defined MACHINE_beaglebone57 53 #define PA_OFFSET 0 58 54 #else -
boot/arch/arm32/include/main.h
r5c1b3cd r71fe7e9d 51 51 #define BBXM_THR_FULL 0x00000001 52 52 53 /** Beaglebone UART register addresses54 *55 * This is UART0 of AM335x CPU56 */57 #define BBONE_SCONS_THR 0x44E0900058 #define BBONE_SCONS_SSR 0x44E0904459 60 /** Check this bit before writing (tx fifo full) */61 #define BBONE_TXFIFO_FULL 0x0000000162 53 63 54 /** GTA02 serial console UART register addresses. -
boot/arch/arm32/include/mm.h
r5c1b3cd r71fe7e9d 63 63 #define BBXM_RAM_END 0xc0000000 64 64 65 /** Start of ram memory on AM335x */66 #define AM335x_RAM_START 0x8000000067 /** End of ram memory on AM335x */68 #define AM335x_RAM_END 0xC000000069 70 65 71 66 /* Page table level 0 entry - "section" format is used … … 81 76 unsigned int access_permission_0 : 2; 82 77 unsigned int tex : 3; 83 unsigned int access_permission_1 : 1; 84 unsigned int shareable : 1; 78 unsigned int access_permission_1 : 2; 85 79 unsigned int non_global : 1; 86 80 unsigned int should_be_zero_2 : 1; -
boot/arch/arm32/src/mm.c
r5c1b3cd r71fe7e9d 38 38 #include <arch/mm.h> 39 39 40 /** Disable the MMU */41 static void disable_paging(void)42 {43 asm volatile (44 "mrc p15, 0, r0, c1, c0, 0\n"45 "bic r0, r0, #1\n"46 "mcr p15, 0, r0, c1, c0, 0\n"47 ::: "r0"48 );49 }50 51 40 /** Check if caching can be enabled for a given memory section. 52 41 * … … 70 59 const unsigned long address = section << PTE_SECTION_SHIFT; 71 60 if (address >= BBXM_RAM_START && address < BBXM_RAM_END) 72 return 1;73 #elif defined MACHINE_beaglebone74 const unsigned long address = section << PTE_SECTION_SHIFT;75 if (address >= AM335x_RAM_START && address < AM335x_RAM_END)76 61 return 1; 77 62 #endif … … 103 88 pte->tex = 0; 104 89 pte->access_permission_1 = 0; 105 pte->shareable = 0;106 90 pte->non_global = 0; 107 91 pte->should_be_zero_2 = 0; … … 118 102 for (page = 0; page < split_page; page++) 119 103 init_ptl0_section(&boot_pt[page], page); 104 105 /* 106 * Create 1:1 virtual-physical mapping in kernel space 107 * (upper 2 GB), physical addresses start from 0. 108 */ 109 /* BeagleBoard-xM (DM37x) memory starts at 2GB border, 110 * thus mapping only lower 2GB is not not enough. 111 * Map entire AS 1:1 instead and hope it works. */ 112 for (page = split_page; page < PTL0_ENTRIES; page++) 113 #ifndef MACHINE_beagleboardxm 114 init_ptl0_section(&boot_pt[page], page - split_page); 115 #else 116 init_ptl0_section(&boot_pt[page], page); 117 #endif 120 118 121 119 asm volatile ( … … 134 132 "ldr r0, =0x55555555\n" 135 133 "mcr p15, 0, r0, c3, c0, 0\n" 136 134 137 135 /* Current settings */ 138 136 "mrc p15, 0, r0, c1, c0, 0\n" … … 145 143 146 144 "orr r0, r0, r1\n" 147 148 /* Invalidate the TLB content before turning on the MMU.149 * ARMv7-A Reference manual, B3.10.3150 */151 "mcr p15, 0, r0, c8, c7, 0\n"152 145 153 /* Store settings , enable the MMU*/146 /* Store settings */ 154 147 "mcr p15, 0, r0, c1, c0, 0\n" 155 148 ::: "r0", "r1" … … 159 152 /** Start the MMU - initialize page table and enable paging. */ 160 153 void mmu_start() { 161 disable_paging();162 154 init_boot_pt(); 163 155 enable_paging(); -
boot/arch/arm32/src/putchar.c
r5c1b3cd r71fe7e9d 40 40 #include <putchar.h> 41 41 #include <str.h> 42 43 #ifdef MACHINE_beaglebone44 45 /** Send a byte to the am335x serial console.46 *47 * @param byte Byte to send.48 */49 static void scons_sendb_bbone(uint8_t byte)50 {51 volatile uint32_t *thr =52 (volatile uint32_t *) BBONE_SCONS_THR;53 volatile uint32_t *ssr =54 (volatile uint32_t *) BBONE_SCONS_SSR;55 56 /* Wait until transmitter is empty */57 while (*ssr & BBONE_TXFIFO_FULL);58 59 /* Transmit byte */60 *thr = (uint32_t) byte;61 }62 63 #endif64 42 65 43 #ifdef MACHINE_beagleboardxm … … 128 106 static void scons_sendb(uint8_t byte) 129 107 { 130 #ifdef MACHINE_beaglebone131 scons_sendb_bbone(byte);132 #endif133 108 #ifdef MACHINE_beagleboardxm 134 109 scons_sendb_bbxm(byte); -
kernel/Makefile
r5c1b3cd r71fe7e9d 36 36 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common 37 37 COMMON_HEADER = $(ROOT_PATH)/common.h 38 COMMON_HEADER_ARCH = arch/$(KARCH)/include/ arch/common.h38 COMMON_HEADER_ARCH = arch/$(KARCH)/include/common.h 39 39 40 40 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config … … 59 59 REAL_MAP = generic/src/debug/real_map 60 60 61 ABI_INCLUDE = generic/include/abi 62 ARCH_INCLUDE = generic/include/arch 63 GENARCH_INCLUDE = generic/include/genarch 64 61 65 GENMAP = tools/genmap.py 62 66 JOBFILE = $(ROOT_PATH)/tools/jobfile.py … … 72 76 73 77 clean: 74 rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h78 rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h 75 79 find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \; 76 80 … … 78 82 # 79 83 80 INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include 81 INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES)) 84 INCLUDES = generic/include 82 85 83 86 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y) … … 89 92 DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ 90 93 91 GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \94 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 92 95 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 93 96 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 96 99 -pipe 97 100 98 ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \101 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 99 102 -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \ 100 103 -Werror-implicit-function-declaration -wd170 101 104 102 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \105 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 103 106 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 104 107 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 432 435 $(GENMAP) $(MAP_PREV) $(DUMP) $@ 433 436 434 $(DEPEND): $( COMMON_HEADER_ARCH)437 $(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) 435 438 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null 436 439 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 437 440 441 $(ABI_INCLUDE): ../abi/include/ 442 ln -sfn ../../$< $@ 443 444 $(ARCH_INCLUDE): arch/$(KARCH)/include/ 445 ln -sfn ../../$< $@ 446 447 $(GENARCH_INCLUDE): genarch/include/ 448 ln -sfn ../../$< $@ 449 438 450 $(COMMON_HEADER_ARCH): $(COMMON_HEADER) 439 ln -sfn ../../../ ../$< $@451 ln -sfn ../../../$< $@ -
kernel/arch/arm32/Makefile.inc
r5c1b3cd r71fe7e9d 85 85 endif 86 86 87 ifeq ($(MACHINE),beaglebone)88 ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c89 endif90 91 87 ifeq ($(CONFIG_PL050),y) 92 88 ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c -
kernel/arch/arm32/_link.ld.in
r5c1b3cd r71fe7e9d 10 10 #define KERNEL_LOAD_ADDRESS 0xb0a08000 11 11 #elif defined MACHINE_beagleboardxm 12 #define KERNEL_LOAD_ADDRESS 0x80a0000013 #elif defined MACHINE_beaglebone14 12 #define KERNEL_LOAD_ADDRESS 0x80a00000 15 13 #else -
kernel/arch/arm32/src/arm32.c
r5c1b3cd r71fe7e9d 138 138 uint8_t *stck; 139 139 140 stck = &THREAD->kstack[STACK_SIZE ];140 stck = &THREAD->kstack[STACK_SIZE - SP_DELTA]; 141 141 supervisor_sp = (uintptr_t) stck; 142 142 } -
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
r5c1b3cd r71fe7e9d 35 35 #include <arch/exception.h> 36 36 #include <arch/mach/beagleboardxm/beagleboardxm.h> 37 #include <genarch/drivers/amdm37x /uart.h>38 #include <genarch/drivers/amdm37x /irc.h>39 #include <genarch/drivers/amdm37x /gpt.h>37 #include <genarch/drivers/amdm37x_irc/amdm37x_irc.h> 38 #include <genarch/drivers/amdm37x_uart/amdm37x_uart.h> 39 #include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h> 40 40 #include <genarch/fb/fb.h> 41 41 #include <genarch/srln/srln.h> -
kernel/arch/arm32/src/machine_func.c
r5c1b3cd r71fe7e9d 42 42 #include <arch/mach/integratorcp/integratorcp.h> 43 43 #include <arch/mach/beagleboardxm/beagleboardxm.h> 44 #include <arch/mach/beaglebone/beaglebone.h>45 44 46 45 /** Pointer to machine_ops structure being used. */ … … 56 55 #elif defined(MACHINE_beagleboardxm) 57 56 machine_ops = &bbxm_machine_ops; 58 #elif defined(MACHINE_beaglebone)59 machine_ops = &bbone_machine_ops;60 57 #else 61 58 #error Machine type not defined. -
kernel/arch/ia64/src/ivt.S
r5c1b3cd r71fe7e9d 35 35 #define FRS_TO_SAVE 30 36 36 #define STACK_ITEMS (21 + FRS_TO_SAVE * 2) 37 #define STACK_FRAME_SIZE ALIGN_UP((STACK_ITEMS *STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)37 #define STACK_FRAME_SIZE ALIGN_UP((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT) 38 38 39 39 #if (STACK_ITEMS % 2 == 0) -
kernel/arch/ia64/src/proc/scheduler.c
r5c1b3cd r71fe7e9d 90 90 : 91 91 : "r" (&THREAD->kstack[STACK_SIZE / 2]), 92 "r" (&THREAD->kstack[STACK_SIZE / 2 ])92 "r" (&THREAD->kstack[STACK_SIZE / 2 - SP_DELTA]) 93 93 ); 94 94 } -
kernel/arch/mips32/src/mips32.c
r5c1b3cd r71fe7e9d 228 228 { 229 229 supervisor_sp = 230 (uintptr_t) &THREAD->kstack[STACK_SIZE ];230 (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA]; 231 231 } 232 232 -
kernel/arch/mips64/src/mips64.c
r5c1b3cd r71fe7e9d 205 205 { 206 206 supervisor_sp = 207 (uintptr_t) &THREAD->kstack[STACK_SIZE ];207 (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA]; 208 208 } 209 209 -
kernel/arch/ppc32/src/proc/scheduler.c
r5c1b3cd r71fe7e9d 55 55 asm volatile ( 56 56 "mtsprg0 %[ksp]\n" 57 :: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE ]))57 :: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE - SP_DELTA])) 58 58 ); 59 59 } -
kernel/arch/sparc64/src/proc/sun4u/scheduler.c
r5c1b3cd r71fe7e9d 52 52 { 53 53 if (THREAD->uspace) { 54 uint64_t sp;55 56 54 /* 57 55 * Write kernel stack address to %g6 of the alternate and … … 65 63 * before it explicitly uses %g7. 66 64 */ 67 sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS; 65 uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE - 66 (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)); 68 67 write_to_ig_g6(sp); 69 68 write_to_ag_g6(sp); … … 77 76 if (THREAD->uspace) { 78 77 /* sample the state of the userspace window buffer */ 79 THREAD->arch.uspace_window_buffer = 80 (uint8_t *) read_from_ag_g7(); 78 THREAD->arch.uspace_window_buffer = (uint8_t *) read_from_ag_g7(); 81 79 } 82 80 } -
kernel/arch/sparc64/src/proc/sun4v/scheduler.c
r5c1b3cd r71fe7e9d 55 55 { 56 56 if (THREAD->uspace) { 57 uint64_t sp; 58 59 sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS; 57 uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE - 58 (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)); 60 59 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_KSTACK, sp); 61 60 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_WBUF, -
kernel/genarch/Makefile.inc
r5c1b3cd r71fe7e9d 106 106 endif 107 107 108 ifeq ($(CONFIG_AM335X_UART),y)109 GENARCH_SOURCES += \110 genarch/src/drivers/am335x/uart.c111 endif112 113 ifeq ($(CONFIG_AM335X_TIMERS),y)114 GENARCH_SOURCES += \115 genarch/src/drivers/am335x/timer.c116 endif117 118 108 ifeq ($(CONFIG_AMDM37X_UART),y) 119 109 GENARCH_SOURCES += \ 120 genarch/src/drivers/amdm37x /uart.c110 genarch/src/drivers/amdm37x_uart/amdm37x_uart.c 121 111 endif 122 112 -
kernel/generic/src/interrupt/interrupt.c
r5c1b3cd r71fe7e9d 54 54 #include <proc/thread.h> 55 55 #include <arch/cycle.h> 56 #include <arch/stack.h>57 56 #include <str.h> 58 57 #include <trace.h> … … 223 222 /* 224 223 * The istate structure should be right at the bottom of the kernel 225 * memorystack.224 * stack. 226 225 */ 227 return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)]; 226 return (istate_t *) ((uint8_t *) 227 thread->kstack + STACK_SIZE - sizeof(istate_t)); 228 228 } 229 229 -
kernel/generic/src/main/kinit.c
r5c1b3cd r71fe7e9d 250 250 CAP_IO_MANAGER | CAP_IRQ_REG); 251 251 252 if (!ipc_phone_0) {252 if (!ipc_phone_0) 253 253 ipc_phone_0 = &programs[i].task->answerbox; 254 /*255 * Hold the first task so that the256 * ipc_phone_0 remains a valid pointer257 * even if the first task exits for258 * whatever reason.259 */260 task_hold(programs[i].task);261 }262 254 } 263 255 -
kernel/generic/src/proc/task.c
r5c1b3cd r71fe7e9d 125 125 { 126 126 size_t tasks_left; 127 128 if (ipc_phone_0) {129 task_t *task_0 = ipc_phone_0->task;130 ipc_phone_0 = NULL;131 /*132 * The first task is held by kinit(), we need to release it or133 * it will never finish cleanup.134 */135 task_release(task_0);136 }137 127 138 128 /* Repeat until there are any tasks except TASK */ -
uspace/Makefile.common
r5c1b3cd r71fe7e9d 103 103 104 104 LIBC_PREFIX = $(LIB_PREFIX)/c 105 LIBC_INCLUDES_FLAGS = \106 -I$(LIBC_PREFIX)/include \107 -I$(LIBC_PREFIX)/arch/$(UARCH)/include \108 -I$(ROOT_PATH)/abi/include109 105 LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat 110 106 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint … … 186 182 find . -name '*.lo' -follow -exec rm \{\} \; 187 183 188 GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS)-O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \184 GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 189 185 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 190 186 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 193 189 -pipe -g -D__$(ENDIANESS)__ 194 190 195 ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS)-O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \191 ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 196 192 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 197 193 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 200 196 -pipe -g -D__$(ENDIANESS)__ 201 197 202 CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS)-O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \198 CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 203 199 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 204 200 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ -
uspace/app/netecho/netecho.c
r5c1b3cd r71fe7e9d 243 243 if (verbose) 244 244 printf("accept()\n"); 245 245 socket_id = accept(listening_id, (void *) address_buf, &addrlen); 246 246 if (socket_id <= 0) { 247 247 socket_print_error(stderr, socket_id, "Socket accept: ", "\n"); … … 312 312 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen); 313 313 if (rc != EOK) 314 socket_print_error(stderr, rc, "Socket send to: ", "\n");314 socket_print_error(stderr, rc, "Socket send: ", "\n"); 315 315 } 316 316 } … … 394 394 return listening_id; 395 395 } 396 397 /* Bind the listening socket */ 398 rc = bind(listening_id, address, addrlen); 399 if (rc != EOK) { 400 socket_print_error(stderr, rc, "Socket bind: ", "\n"); 401 return rc; 402 } 403 396 404 397 /* if the stream socket is used */ 405 398 if (type == SOCK_STREAM) { … … 409 402 backlog = 3; 410 403 } 411 404 412 405 /* Set the backlog */ 413 406 rc = listen(listening_id, backlog); … … 416 409 return rc; 417 410 } 411 } 412 413 /* Bind the listening socket */ 414 rc = bind(listening_id, address, addrlen); 415 if (rc != EOK) { 416 socket_print_error(stderr, rc, "Socket bind: ", "\n"); 417 return rc; 418 418 } 419 419 -
uspace/app/nettest3/nettest3.c
r5c1b3cd r71fe7e9d 63 63 port = 7; 64 64 65 data = (char *) 65 data = (char *)"Hello World!"; 66 66 size = str_size(data); 67 67 … … 98 98 99 99 printf("connect()\n"); 100 rc = connect(fd, (struct sockaddr *) 100 rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); 101 101 printf(" -> %d\n", rc); 102 102 if (rc != 0) … … 115 115 } while (rc > 0); 116 116 117 async_usleep(1000 *1000);117 async_usleep(1000*1000); 118 118 119 119 printf("closesocket()\n"); … … 124 124 } 125 125 126 126 127 /** @} 127 128 */ -
uspace/drv/char/i8042/main.c
r5c1b3cd r71fe7e9d 36 36 37 37 #include <libarch/inttypes.h> 38 #include <libarch/config.h>39 38 #include <ddf/driver.h> 40 39 #include <device/hw_res_parsed.h> … … 43 42 #include <ddf/log.h> 44 43 #include <stdio.h> 45 #include <async.h>46 44 #include "i8042.h" 47 45 … … 154 152 printf("%s: HelenOS PS/2 driver.\n", NAME); 155 153 ddf_log_init(NAME); 156 157 /*158 * Alleviate the virtual memory / page table pressure caused by159 * interrupt storms when the default large stacks are used.160 */161 async_set_interrupt_handler_stack_size(PAGE_SIZE);162 163 154 return ddf_driver_main(&i8042_driver); 164 155 } -
uspace/lib/c/Makefile
r5c1b3cd r71fe7e9d 31 31 ROOT_PATH = $(USPACE_PREFIX)/.. 32 32 33 INCLUDE_ABI = include/abi 34 INCLUDE_LIBARCH = include/libarch 35 33 36 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common 34 37 COMMON_HEADER = $(ROOT_PATH)/common.h 35 COMMON_HEADER_ARCH = arch/$(UARCH)/include/ libarch/common.h38 COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h 36 39 37 40 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config … … 43 46 $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld 44 47 45 PRE_DEPEND = $( COMMON_HEADER_ARCH)48 PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) 46 49 EXTRA_OUTPUT = $(LINKER_SCRIPTS) 47 EXTRA_CLEAN = $( COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)50 EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS) 48 51 LIBRARY = libc 49 52 SLIBRARY = libc.so.0.0 … … 159 162 include $(USPACE_PREFIX)/Makefile.common 160 163 164 $(INCLUDE_LIBARCH): arch/$(UARCH)/include 165 ln -sfn ../$< $@ 166 167 $(INCLUDE_ABI): ../../../abi/include/ 168 ln -sfn ../$< $@ 161 169 162 170 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in … … 173 181 174 182 $(COMMON_HEADER_ARCH): $(COMMON_HEADER) 175 ln -sfn ../../../ ../$< $@183 ln -sfn ../../../$< $@ -
uspace/lib/c/arch/abs32le/src/tls.c
r5c1b3cd r71fe7e9d 34 34 #include <unistd.h> 35 35 36 tcb_t * tls_alloc_arch(void **data, size_t size)36 tcb_t * __alloc_tls(void **data, size_t size) 37 37 { 38 38 return tls_alloc_variant_2(data, size); 39 39 } 40 40 41 void tls_free_arch(tcb_t *tcb, size_t size)41 void __free_tls_arch(tcb_t *tcb, size_t size) 42 42 { 43 43 tls_free_variant_2(tcb, size); -
uspace/lib/c/arch/amd64/src/tls.c
r5c1b3cd r71fe7e9d 38 38 #include <sys/types.h> 39 39 40 tcb_t * tls_alloc_arch(void **data, size_t size)40 tcb_t * __alloc_tls(void **data, size_t size) 41 41 { 42 42 return tls_alloc_variant_2(data, size); 43 43 } 44 44 45 void tls_free_arch(tcb_t *tcb, size_t size)45 void __free_tls_arch(tcb_t *tcb, size_t size) 46 46 { 47 47 tls_free_variant_2(tcb, size); -
uspace/lib/c/arch/arm32/src/tls.c
r5c1b3cd r71fe7e9d 38 38 #include <sys/types.h> 39 39 40 tcb_t * tls_alloc_arch(void **data, size_t size)40 tcb_t * __alloc_tls(void **data, size_t size) 41 41 { 42 42 return tls_alloc_variant_1(data, size); 43 43 } 44 44 45 void tls_free_arch(tcb_t *tcb, size_t size)45 void __free_tls_arch(tcb_t *tcb, size_t size) 46 46 { 47 47 tls_free_variant_1(tcb, size); -
uspace/lib/c/arch/ia32/src/tls.c
r5c1b3cd r71fe7e9d 39 39 #include <align.h> 40 40 41 tcb_t * tls_alloc_arch(void **data, size_t size)41 tcb_t * __alloc_tls(void **data, size_t size) 42 42 { 43 43 return tls_alloc_variant_2(data, size); 44 44 } 45 45 46 void tls_free_arch(tcb_t *tcb, size_t size)46 void __free_tls_arch(tcb_t *tcb, size_t size) 47 47 { 48 48 tls_free_variant_2(tcb, size); -
uspace/lib/c/arch/ia64/src/tls.c
r5c1b3cd r71fe7e9d 38 38 #include <malloc.h> 39 39 40 tcb_t * tls_alloc_arch(void **data, size_t size)40 tcb_t * __alloc_tls(void **data, size_t size) 41 41 { 42 42 return tls_alloc_variant_1(data, size); 43 43 } 44 44 45 void tls_free_arch(tcb_t *tcb, size_t size)45 void __free_tls_arch(tcb_t *tcb, size_t size) 46 46 { 47 47 tls_free_variant_1(tcb, size); -
uspace/lib/c/arch/mips32/src/tls.c
r5c1b3cd r71fe7e9d 37 37 #include <sys/types.h> 38 38 39 tcb_t * tls_alloc_arch(void **data, size_t size)39 tcb_t * __alloc_tls(void **data, size_t size) 40 40 { 41 41 return tls_alloc_variant_1(data, size); 42 42 } 43 43 44 void tls_free_arch(tcb_t *tcb, size_t size)44 void __free_tls_arch(tcb_t *tcb, size_t size) 45 45 { 46 46 tls_free_variant_1(tcb, size); -
uspace/lib/c/arch/mips64/src/tls.c
r5c1b3cd r71fe7e9d 37 37 #include <sys/types.h> 38 38 39 tcb_t * tls_alloc_arch(void **data, size_t size)39 tcb_t * __alloc_tls(void **data, size_t size) 40 40 { 41 41 return tls_alloc_variant_1(data, size); 42 42 } 43 43 44 void tls_free_arch(tcb_t *tcb, size_t size)44 void __free_tls_arch(tcb_t *tcb, size_t size) 45 45 { 46 46 tls_free_variant_1(tcb, size); -
uspace/lib/c/arch/ppc32/src/tls.c
r5c1b3cd r71fe7e9d 36 36 #include <sys/types.h> 37 37 38 tcb_t * tls_alloc_arch(void **data, size_t size)38 tcb_t * __alloc_tls(void **data, size_t size) 39 39 { 40 40 return tls_alloc_variant_1(data, size); 41 41 } 42 42 43 void tls_free_arch(tcb_t *tcb, size_t size)43 void __free_tls_arch(tcb_t *tcb, size_t size) 44 44 { 45 45 tls_free_variant_1(tcb, size); -
uspace/lib/c/arch/sparc64/src/tls.c
r5c1b3cd r71fe7e9d 38 38 #include <sys/types.h> 39 39 40 tcb_t * tls_alloc_arch(void **data, size_t size)40 tcb_t * __alloc_tls(void **data, size_t size) 41 41 { 42 42 return tls_alloc_variant_2(data, size); 43 43 } 44 44 45 void tls_free_arch(tcb_t *tcb, size_t size)45 void __free_tls_arch(tcb_t *tcb, size_t size) 46 46 { 47 47 tls_free_variant_2(tcb, size); -
uspace/lib/c/generic/async.c
r5c1b3cd r71fe7e9d 350 350 static async_client_conn_t client_connection = default_client_connection; 351 351 static async_interrupt_handler_t interrupt_received = default_interrupt_received; 352 static size_t interrupt_handler_stksz = FIBRIL_DFLT_STK_SIZE;353 352 354 353 /** Setter for client_connection function pointer. … … 371 370 { 372 371 interrupt_received = intr; 373 }374 375 /** Set the stack size for the interrupt handler notification fibrils.376 *377 * @param size Stack size in bytes.378 */379 void async_set_interrupt_handler_stack_size(size_t size)380 {381 interrupt_handler_stksz = size;382 372 } 383 373 … … 597 587 msg->call = *call; 598 588 599 fid_t fid = fibril_create_generic(notification_fibril, msg, 600 interrupt_handler_stksz); 589 fid_t fid = fibril_create(notification_fibril, msg); 601 590 if (fid == 0) { 602 591 free(msg); … … 2068 2057 2069 2058 async_sess_t *sess = exch->sess; 2070 assert(sess != NULL);2071 2059 2072 2060 atomic_dec(&sess->refcnt); -
uspace/lib/c/generic/fibril.c
r5c1b3cd r71fe7e9d 95 95 fibril_t *fibril_setup(void) 96 96 { 97 tcb_t *tcb = tls_make();97 tcb_t *tcb = __make_tls(); 98 98 if (!tcb) 99 99 return NULL; … … 101 101 fibril_t *fibril = malloc(sizeof(fibril_t)); 102 102 if (!fibril) { 103 tls_free(tcb);103 __free_tls(tcb); 104 104 return NULL; 105 105 } … … 122 122 void fibril_teardown(fibril_t *fibril) 123 123 { 124 tls_free(fibril->tcb);124 __free_tls(fibril->tcb); 125 125 free(fibril); 126 126 } … … 256 256 * @param func Implementing function of the new fibril. 257 257 * @param arg Argument to pass to func. 258 * @param stksz Stack size in bytes.259 258 * 260 259 * @return 0 on failure or TLS of the new fibril. 261 260 * 262 261 */ 263 fid_t fibril_create _generic(int (*func)(void *), void *arg, size_t stksz)262 fid_t fibril_create(int (*func)(void *), void *arg) 264 263 { 265 264 fibril_t *fibril; … … 269 268 return 0; 270 269 271 size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ? 272 stack_size_get() : stksz; 270 size_t stack_size = stack_size_get(); 273 271 fibril->stack = as_area_create((void *) -1, stack_size, 274 272 AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD | -
uspace/lib/c/generic/net/socket_client.c
r5c1b3cd r71fe7e9d 192 192 /** Default thread for new connections. 193 193 * 194 * @param[in] iid The initial message identifier. 195 * @param[in] icall The initial message call structure. 196 * @param[in] arg Local argument. 197 * 194 * @param[in] iid The initial message identifier. 195 * @param[in] icall The initial message call structure. 196 * @param[in] arg Local argument. 198 197 */ 199 198 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall, void *arg) 200 199 { 201 while (true) { 202 ipc_call_t call; 203 ipc_callid_t callid = async_get_call(&call); 204 205 if (!IPC_GET_IMETHOD(call)) { 206 async_answer_0(callid, 0); 207 return; 200 ipc_callid_t callid; 201 ipc_call_t call; 202 socket_t *socket; 203 int rc; 204 205 loop: 206 callid = async_get_call(&call); 207 208 switch (IPC_GET_IMETHOD(call)) { 209 case NET_SOCKET_RECEIVED: 210 case NET_SOCKET_ACCEPTED: 211 case NET_SOCKET_DATA_FRAGMENT_SIZE: 212 fibril_rwlock_read_lock(&socket_globals.lock); 213 214 /* Find the socket */ 215 socket = sockets_find(socket_get_sockets(), 216 SOCKET_GET_SOCKET_ID(call)); 217 if (!socket) { 218 rc = ENOTSOCK; 219 fibril_rwlock_read_unlock(&socket_globals.lock); 220 break; 208 221 } 209 210 int rc;211 222 212 223 switch (IPC_GET_IMETHOD(call)) { 213 224 case NET_SOCKET_RECEIVED: 225 fibril_mutex_lock(&socket->receive_lock); 226 /* Push the number of received packet fragments */ 227 rc = dyn_fifo_push(&socket->received, 228 SOCKET_GET_DATA_FRAGMENTS(call), 229 SOCKET_MAX_RECEIVED_SIZE); 230 if (rc == EOK) { 231 /* Signal the received packet */ 232 fibril_condvar_signal(&socket->receive_signal); 233 } 234 fibril_mutex_unlock(&socket->receive_lock); 235 break; 236 214 237 case NET_SOCKET_ACCEPTED: 215 case NET_SOCKET_DATA_FRAGMENT_SIZE: 216 fibril_rwlock_read_lock(&socket_globals.lock); 217 218 /* Find the socket */ 219 socket_t *socket = sockets_find(socket_get_sockets(), 220 SOCKET_GET_SOCKET_ID(call)); 221 if (!socket) { 222 rc = ENOTSOCK; 223 fibril_rwlock_read_unlock(&socket_globals.lock); 224 break; 238 /* Push the new socket identifier */ 239 fibril_mutex_lock(&socket->accept_lock); 240 rc = dyn_fifo_push(&socket->accepted, 1, 241 SOCKET_MAX_ACCEPTED_SIZE); 242 if (rc == EOK) { 243 /* Signal the accepted socket */ 244 fibril_condvar_signal(&socket->accept_signal); 225 245 } 226 227 switch (IPC_GET_IMETHOD(call)) { 228 case NET_SOCKET_RECEIVED: 229 fibril_mutex_lock(&socket->receive_lock); 230 /* Push the number of received packet fragments */ 231 rc = dyn_fifo_push(&socket->received, 232 SOCKET_GET_DATA_FRAGMENTS(call), 233 SOCKET_MAX_RECEIVED_SIZE); 234 if (rc == EOK) { 235 /* Signal the received packet */ 236 fibril_condvar_signal(&socket->receive_signal); 237 } 238 fibril_mutex_unlock(&socket->receive_lock); 239 break; 240 241 case NET_SOCKET_ACCEPTED: 242 /* Push the new socket identifier */ 243 fibril_mutex_lock(&socket->accept_lock); 244 rc = dyn_fifo_push(&socket->accepted, 1, 245 SOCKET_MAX_ACCEPTED_SIZE); 246 if (rc == EOK) { 247 /* Signal the accepted socket */ 248 fibril_condvar_signal(&socket->accept_signal); 249 } 250 fibril_mutex_unlock(&socket->accept_lock); 251 break; 252 253 default: 254 rc = ENOTSUP; 255 } 256 257 if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) && 258 (SOCKET_GET_DATA_FRAGMENT_SIZE(call) != 259 socket->data_fragment_size)) { 260 fibril_rwlock_write_lock(&socket->sending_lock); 261 262 /* Set the data fragment size */ 263 socket->data_fragment_size = 264 SOCKET_GET_DATA_FRAGMENT_SIZE(call); 265 266 fibril_rwlock_write_unlock(&socket->sending_lock); 267 } 268 269 fibril_rwlock_read_unlock(&socket_globals.lock); 246 fibril_mutex_unlock(&socket->accept_lock); 270 247 break; 271 248 272 249 default: 273 250 rc = ENOTSUP; 274 251 } 275 276 async_answer_0(callid, (sysarg_t) rc); 277 } 252 253 if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) && 254 (SOCKET_GET_DATA_FRAGMENT_SIZE(call) != 255 socket->data_fragment_size)) { 256 fibril_rwlock_write_lock(&socket->sending_lock); 257 258 /* Set the data fragment size */ 259 socket->data_fragment_size = 260 SOCKET_GET_DATA_FRAGMENT_SIZE(call); 261 262 fibril_rwlock_write_unlock(&socket->sending_lock); 263 } 264 265 fibril_rwlock_read_unlock(&socket_globals.lock); 266 break; 267 268 default: 269 rc = ENOTSUP; 270 } 271 272 async_answer_0(callid, (sysarg_t) rc); 273 goto loop; 278 274 } 279 275 -
uspace/lib/c/generic/tls.c
r5c1b3cd r71fe7e9d 51 51 * @return Pointer to TCB. 52 52 */ 53 tcb_t * tls_make(void)53 tcb_t *__make_tls(void) 54 54 { 55 55 void *data; … … 57 57 size_t tls_size = &_tbss_end - &_tdata_start; 58 58 59 tcb = tls_alloc_arch(&data, tls_size);59 tcb = __alloc_tls(&data, tls_size); 60 60 if (!tcb) 61 61 return NULL; … … 74 74 } 75 75 76 void tls_free(tcb_t *tcb)76 void __free_tls(tcb_t *tcb) 77 77 { 78 78 size_t tls_size = &_tbss_end - &_tdata_start; 79 tls_free_arch(tcb, tls_size);79 __free_tls_arch(tcb, tls_size); 80 80 } 81 81 -
uspace/lib/c/include/async.h
r5c1b3cd r71fe7e9d 156 156 extern void async_set_client_connection(async_client_conn_t); 157 157 extern void async_set_interrupt_received(async_interrupt_handler_t); 158 extern void async_set_interrupt_handler_stack_size(size_t);159 158 160 159 /* -
uspace/lib/c/include/fibril.h
r5c1b3cd r71fe7e9d 86 86 extern void context_restore(context_t *ctx) __attribute__((noreturn)); 87 87 88 #define FIBRIL_DFLT_STK_SIZE 0 89 90 #define fibril_create(func, arg) \ 91 fibril_create_generic((func), (arg), FIBRIL_DFLT_STK_SIZE) 92 extern fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t); 88 extern fid_t fibril_create(int (*func)(void *), void *arg); 93 89 extern void fibril_destroy(fid_t fid); 94 90 extern fibril_t *fibril_setup(void); -
uspace/lib/c/include/macros.h
r5c1b3cd r71fe7e9d 38 38 #define min(a, b) ((a) < (b) ? (a) : (b)) 39 39 #define max(a, b) ((a) > (b) ? (a) : (b)) 40 #define abs(a) ((a) >= 0 ? (a) : -(a))40 #define abs(a) ((a) >= 0 ? (a) : (-a)) 41 41 42 42 #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) -
uspace/lib/c/include/tls.h
r5c1b3cd r71fe7e9d 48 48 extern char _tbss_end; 49 49 50 extern tcb_t * tls_make(void);51 extern tcb_t * tls_alloc_arch(void **, size_t);52 extern void tls_free(tcb_t *);53 extern void tls_free_arch(tcb_t *, size_t);50 extern tcb_t *__make_tls(void); 51 extern tcb_t *__alloc_tls(void **, size_t); 52 extern void __free_tls(tcb_t *); 53 extern void __free_tls_arch(tcb_t *, size_t); 54 54 55 55 #ifdef CONFIG_TLS_VARIANT_1 -
uspace/srv/net/tcp/conn.c
r5c1b3cd r71fe7e9d 354 354 { 355 355 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp); 356 357 log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare conn (f:(%x,%u), l:(%x,%u))", 358 sp->foreign.addr.ipv4, sp->foreign.port, 359 sp->local.addr.ipv4, sp->local.port); 360 356 361 357 fibril_mutex_lock(&conn_list_lock); 362 358 363 359 list_foreach(conn_list, link) { 364 360 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link); 365 361 tcp_sockpair_t *csp = &conn->ident; 366 367 log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%x,%u), l:(%x,%u))", 362 log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))", 368 363 csp->foreign.addr.ipv4, csp->foreign.port, 369 364 csp->local.addr.ipv4, csp->local.port); 370 371 365 if (tcp_sockpair_match(sp, csp)) { 372 366 tcp_conn_addref(conn); … … 375 369 } 376 370 } 377 371 378 372 fibril_mutex_unlock(&conn_list_lock); 379 373 return NULL; -
uspace/srv/net/tcp/sock.c
r5c1b3cd r71fe7e9d 203 203 { 204 204 int rc; 205 struct sockaddr _in*addr;206 size_t addr_ size;205 struct sockaddr *addr; 206 size_t addr_len; 207 207 socket_core_t *sock_core; 208 208 tcp_sockdata_t *socket; 209 209 210 210 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_bind()"); 211 211 log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept"); 212 213 addr = NULL; 214 215 rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_size); 212 rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len); 216 213 if (rc != EOK) { 217 214 async_answer_0(callid, rc); 218 goto out; 219 } 220 221 if (addr_size != sizeof(struct sockaddr_in)) { 222 async_answer_0(callid, EINVAL); 223 goto out; 224 } 225 215 return; 216 } 217 226 218 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind"); 227 219 rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), 228 addr, addr_ size, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,220 addr, addr_len, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END, 229 221 last_used_port); 230 222 if (rc != EOK) { 231 223 async_answer_0(callid, rc); 232 goto out;233 } 234 224 return; 225 } 226 235 227 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find"); 236 228 sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call)); 237 if (sock_core == NULL) { 238 async_answer_0(callid, ENOENT); 239 goto out; 240 } 241 242 socket = (tcp_sockdata_t *)sock_core->specific_data; 243 /* XXX Anything to do? */ 244 (void) socket; 245 229 if (sock_core != NULL) { 230 socket = (tcp_sockdata_t *)sock_core->specific_data; 231 /* XXX Anything to do? */ 232 (void) socket; 233 } 234 246 235 log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); 247 236 async_answer_0(callid, EOK); 248 249 out:250 if (addr != NULL)251 free(addr);252 237 } 253 238 … … 264 249 tcp_sock_lconn_t *lconn; 265 250 int i; 266 int rc;267 251 268 252 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_listen()"); … … 284 268 return; 285 269 } 286 287 if (sock_core->port <= 0) { 288 rc = socket_bind_free_port(&gsock, sock_core, 289 TCP_FREE_PORTS_START, TCP_FREE_PORTS_END, 290 last_used_port); 291 if (rc != EOK) { 292 async_answer_0(callid, rc); 293 return; 294 } 295 296 last_used_port = sock_core->port; 297 } 298 299 socket = (tcp_sockdata_t *) sock_core->specific_data; 300 270 271 socket = (tcp_sockdata_t *)sock_core->specific_data; 272 301 273 /* 302 274 * Prepare @c backlog listening connections. 303 275 */ 304 276 fibril_mutex_lock(&socket->lock); 305 277 306 278 socket->backlog = backlog; 307 279 socket->lconn = calloc(backlog, sizeof(tcp_conn_t *)); … … 311 283 return; 312 284 } 313 285 314 286 log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections"); 315 287 316 288 lsocket.addr.ipv4 = TCP_IPV4_ANY; 317 289 lsocket.port = sock_core->port; 318 290 fsocket.addr.ipv4 = TCP_IPV4_ANY; 319 291 fsocket.port = TCP_PORT_ANY; 320 292 321 293 for (i = 0; i < backlog; i++) { 322 294 … … 390 362 return; 391 363 } 392 364 393 365 last_used_port = sock_core->port; 394 366 } … … 469 441 return; 470 442 } 471 472 if (sock_core->port <= 0) {473 rc = socket_bind_free_port(&gsock, sock_core,474 TCP_FREE_PORTS_START, TCP_FREE_PORTS_END,475 last_used_port);476 if (rc != EOK) {477 async_answer_0(callid, rc);478 return;479 }480 481 last_used_port = sock_core->port;482 }483 443 484 444 socket = (tcp_sockdata_t *)sock_core->specific_data; -
uspace/srv/net/udp/assoc.c
r5c1b3cd r71fe7e9d 200 200 /** Set local socket in association. 201 201 * 202 * @param assoc Association 203 * @param lsock Local socket (deeply copied) 204 * 202 * @param assoc Association 203 * @param fsock Foreign socket (deeply copied) 205 204 */ 206 205 void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock) … … 209 208 fibril_mutex_lock(&assoc->lock); 210 209 assoc->ident.local = *lsock; 211 fibril_mutex_unlock(&assoc->lock);212 }213 214 /** Set local port in association.215 *216 * @param assoc Association217 * @param lport Local port218 *219 */220 void udp_assoc_set_local_port(udp_assoc_t *assoc, uint16_t lport)221 {222 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %" PRIu16 ")", assoc, lport);223 fibril_mutex_lock(&assoc->lock);224 assoc->ident.local.port = lport;225 210 fibril_mutex_unlock(&assoc->lock); 226 211 } … … 421 406 } 422 407 408 423 409 /** 424 410 * @} -
uspace/srv/net/udp/assoc.h
r5c1b3cd r71fe7e9d 47 47 extern void udp_assoc_set_foreign(udp_assoc_t *, udp_sock_t *); 48 48 extern void udp_assoc_set_local(udp_assoc_t *, udp_sock_t *); 49 extern void udp_assoc_set_local_port(udp_assoc_t *, uint16_t);50 49 extern int udp_assoc_send(udp_assoc_t *, udp_sock_t *, udp_msg_t *); 51 50 extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, udp_sock_t *); -
uspace/srv/net/udp/sock.c
r5c1b3cd r71fe7e9d 90 90 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_notify_data(%d)", sock_core->socket_id); 91 91 async_exch_t *exch = async_exchange_begin(sock_core->sess); 92 async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t) 92 async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t)sock_core->socket_id, 93 93 UDP_FRAGMENT_SIZE, 0, 0, 1); 94 94 async_exchange_end(exch); … … 177 177 goto out; 178 178 } 179 180 if (addr_size != sizeof(struct sockaddr_in)) { 181 async_answer_0(callid, EINVAL); 182 goto out; 183 } 184 179 185 180 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind"); 186 181 rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), … … 191 186 goto out; 192 187 } 193 188 189 if (addr_size != sizeof(struct sockaddr_in)) { 190 async_answer_0(callid, EINVAL); 191 goto out; 192 } 193 194 194 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find"); 195 195 sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call)); … … 249 249 static void udp_sock_sendto(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) 250 250 { 251 int socket_id; 252 int fragments; 253 int index; 254 struct sockaddr_in *addr; 255 size_t addr_size; 256 socket_core_t *sock_core; 257 udp_sockdata_t *socket; 258 udp_sock_t fsock, *fsockp; 259 ipc_call_t answer; 260 ipc_callid_t wcallid; 261 size_t length; 262 uint8_t buffer[UDP_FRAGMENT_SIZE]; 263 udp_error_t urc; 264 int rc; 265 251 266 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()"); 252 253 struct sockaddr_in *addr = NULL; 254 udp_sock_t fsock; 255 udp_sock_t *fsock_ptr; 256 267 268 addr = NULL; 269 257 270 if (IPC_GET_IMETHOD(call) == NET_SOCKET_SENDTO) { 258 size_t addr_size; 259 int rc = async_data_write_accept((void **) &addr, false, 271 rc = async_data_write_accept((void **) &addr, false, 260 272 0, 0, 0, &addr_size); 261 273 if (rc != EOK) { … … 263 275 goto out; 264 276 } 265 277 266 278 if (addr_size != sizeof(struct sockaddr_in)) { 267 279 async_answer_0(callid, EINVAL); 268 280 goto out; 269 281 } 270 282 271 283 fsock.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr); 272 284 fsock.port = uint16_t_be2host(addr->sin_port); 273 fsock_ptr = &fsock; 274 } else 275 fsock_ptr = NULL; 276 277 int socket_id = SOCKET_GET_SOCKET_ID(call); 278 285 fsockp = &fsock; 286 } else { 287 fsockp = NULL; 288 } 289 290 socket_id = SOCKET_GET_SOCKET_ID(call); 291 fragments = SOCKET_GET_DATA_FRAGMENTS(call); 279 292 SOCKET_GET_FLAGS(call); 280 281 socket_core_t *sock_core = 282 socket_cores_find(&client->sockets, socket_id); 293 294 sock_core = socket_cores_find(&client->sockets, socket_id); 283 295 if (sock_core == NULL) { 284 296 async_answer_0(callid, ENOTSOCK); 285 297 goto out; 286 298 } 287 288 udp_sockdata_t *socket = 289 (udp_sockdata_t *) sock_core->specific_data; 290 291 if (sock_core->port <= 0) { 299 300 if (sock_core->port == 0) { 292 301 /* Implicitly bind socket to port */ 293 int rc = socket_bind_free_port(&gsock, sock_core, 294 UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, last_used_port); 302 rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), 303 addr, addr_size, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, 304 last_used_port); 295 305 if (rc != EOK) { 296 306 async_answer_0(callid, rc); 297 307 goto out; 298 308 } 299 300 assert(sock_core->port > 0); 301 302 udp_error_t urc = udp_uc_set_local_port(socket->assoc, 303 sock_core->port); 304 305 if (urc != UDP_EOK) { 306 // TODO: better error handling 307 async_answer_0(callid, EINTR); 308 goto out; 309 } 310 311 last_used_port = sock_core->port; 312 } 313 309 } 310 311 socket = (udp_sockdata_t *)sock_core->specific_data; 314 312 fibril_mutex_lock(&socket->lock); 315 313 316 314 if (socket->assoc->ident.local.addr.ipv4 == UDP_IPV4_ANY) { 317 315 /* Determine local IP address */ 318 316 inet_addr_t loc_addr, rem_addr; 319 320 rem_addr.ipv4 = fsock _ptr? fsock.addr.ipv4 :317 318 rem_addr.ipv4 = fsockp ? fsock.addr.ipv4 : 321 319 socket->assoc->ident.foreign.addr.ipv4; 322 323 intrc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);320 321 rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr); 324 322 if (rc != EOK) { 325 323 fibril_mutex_unlock(&socket->lock); … … 329 327 return; 330 328 } 331 329 332 330 socket->assoc->ident.local.addr.ipv4 = loc_addr.ipv4; 333 331 log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x", 334 332 socket->assoc->ident.local.addr.ipv4); 335 333 } 336 334 335 337 336 assert(socket->assoc != NULL); 338 339 int fragments = SOCKET_GET_DATA_FRAGMENTS(call); 340 for (int index = 0; index < fragments; index++) { 341 ipc_callid_t wcallid; 342 size_t length; 343 337 338 for (index = 0; index < fragments; index++) { 344 339 if (!async_data_write_receive(&wcallid, &length)) { 345 340 fibril_mutex_unlock(&socket->lock); … … 347 342 goto out; 348 343 } 349 344 350 345 if (length > UDP_FRAGMENT_SIZE) 351 346 length = UDP_FRAGMENT_SIZE; 352 353 uint8_t buffer[UDP_FRAGMENT_SIZE]; 354 int rc = async_data_write_finalize(wcallid, buffer, length); 347 348 rc = async_data_write_finalize(wcallid, buffer, length); 355 349 if (rc != EOK) { 356 350 fibril_mutex_unlock(&socket->lock); … … 358 352 goto out; 359 353 } 360 361 udp_error_t urc = 362 udp_uc_send(socket->assoc, fsock_ptr, buffer, length, 0); 363 354 355 urc = udp_uc_send(socket->assoc, fsockp, buffer, length, 0); 356 364 357 switch (urc) { 365 358 case UDP_EOK: 366 359 rc = EOK; 367 360 break; 368 case UDP_ENORES:369 rc = ENO MEM;370 break; 371 case UDP_EUNSPEC:372 rc = E INVAL;373 break; 374 case UDP_ENOROUTE:375 rc = E IO;376 break; 361 /* case TCP_ENOTEXIST: 362 rc = ENOTCONN; 363 break; 364 case TCP_ECLOSING: 365 rc = ENOTCONN; 366 break; 367 case TCP_ERESET: 368 rc = ECONNABORTED; 369 break;*/ 377 370 default: 378 371 assert(false); 379 372 } 380 373 381 374 if (rc != EOK) { 382 375 fibril_mutex_unlock(&socket->lock); … … 385 378 } 386 379 } 387 388 ipc_call_t answer;389 380 390 381 IPC_SET_ARG1(answer, 0); … … 535 526 static void udp_sock_close(udp_client_t *client, ipc_callid_t callid, ipc_call_t call) 536 527 { 528 int socket_id; 529 socket_core_t *sock_core; 530 udp_sockdata_t *socket; 531 int rc; 532 537 533 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()"); 538 int socket_id = SOCKET_GET_SOCKET_ID(call); 539 540 socket_core_t *sock_core = 541 socket_cores_find(&client->sockets, socket_id); 534 socket_id = SOCKET_GET_SOCKET_ID(call); 535 536 sock_core = socket_cores_find(&client->sockets, socket_id); 542 537 if (sock_core == NULL) { 543 538 async_answer_0(callid, ENOTSOCK); 544 539 return; 545 540 } 546 547 udp_sockdata_t *socket = 548 (udp_sockdata_t *) sock_core->specific_data; 541 542 socket = (udp_sockdata_t *)sock_core->specific_data; 549 543 fibril_mutex_lock(&socket->lock); 550 551 intrc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,544 545 rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock, 552 546 udp_free_sock_data); 553 547 if (rc != EOK) { … … 556 550 return; 557 551 } 558 552 559 553 fibril_mutex_unlock(&socket->lock); 560 554 async_answer_0(callid, EOK); … … 589 583 &sock->recv_buffer_lock); 590 584 } 591 585 592 586 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] call udp_uc_receive()"); 593 587 urc = udp_uc_receive(sock->assoc, sock->recv_buffer, 594 588 UDP_FRAGMENT_SIZE, &rcvd, &xflags, &sock->recv_fsock); 595 589 sock->recv_error = urc; 596 590 597 591 udp_sock_notify_data(sock->sock_core); 598 592 599 593 if (urc != UDP_EOK) { 600 594 fibril_condvar_broadcast(&sock->recv_buffer_cv); … … 602 596 break; 603 597 } 604 598 605 599 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] got data - broadcast recv_buffer_cv"); 606 600 607 601 sock->recv_buffer_used = rcvd; 608 602 fibril_mutex_unlock(&sock->recv_buffer_lock); -
uspace/srv/net/udp/ucall.c
r5c1b3cd r71fe7e9d 68 68 { 69 69 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock); 70 70 71 71 udp_assoc_set_local(assoc, lsock); 72 return UDP_EOK;73 }74 75 udp_error_t udp_uc_set_local_port(udp_assoc_t *assoc, uint16_t lport)76 {77 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %" PRIu16 ")", assoc, lport);78 79 udp_assoc_set_local_port(assoc, lport);80 72 return UDP_EOK; 81 73 } -
uspace/srv/net/udp/ucall.h
r5c1b3cd r71fe7e9d 42 42 extern udp_error_t udp_uc_set_foreign(udp_assoc_t *, udp_sock_t *); 43 43 extern udp_error_t udp_uc_set_local(udp_assoc_t *, udp_sock_t *); 44 extern udp_error_t udp_uc_set_local_port(udp_assoc_t *, uint16_t);45 44 extern udp_error_t udp_uc_send(udp_assoc_t *, udp_sock_t *, void *, size_t, 46 45 xflags_t); -
uspace/srv/net/udp/udp_type.h
r5c1b3cd r71fe7e9d 66 66 }; 67 67 68 enum udp_port {68 enum tcp_port { 69 69 UDP_PORT_ANY = 0 70 70 }; -
version
r5c1b3cd r71fe7e9d 46 46 47 47 NAME = Fajtl 48 COPYRIGHT = Copyright (c) 2001-2013 HelenOS project 49 48 COPYRIGHT = Copyright (c) 2001-2012 HelenOS project
Note:
See TracChangeset
for help on using the changeset viewer.