Index: HelenOS.config =================================================================== --- HelenOS.config (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ HelenOS.config (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -441,4 +441,7 @@ ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_UART (y/n) +% Support for Samsung S3C24XX on-chip interrupt controller +! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y) + % Support for Z8530 controller ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic] CONFIG_Z8530 (y/n) @@ -469,5 +472,5 @@ % Serial line input module -! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) +! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) % EGA support @@ -543,2 +546,4 @@ ! CONFIG_BAREBONE (n/y) +% Line debugging information +! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y) Index: boot/Makefile =================================================================== --- boot/Makefile (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -48,5 +48,5 @@ endif ifeq ($(RDFMT),fat) - $(MKFAT) $(DIST_PATH) $@ + $(MKFAT) 1048576 $(DIST_PATH) $@ endif Index: boot/Makefile.build =================================================================== --- boot/Makefile.build (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/Makefile.build (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -61,4 +61,11 @@ GCC_CFLAGS += -Werror ICC_CFLAGS += -Werror +endif + +ifeq ($(CONFIG_LINE_DEBUG),y) + GCC_CFLAGS += -g + ICC_CFLAGS += -g + SUNCC_CFLAGS += -g + CLANG_CFLAGS += -g endif Index: boot/arch/arm32/Makefile.inc =================================================================== --- boot/arch/arm32/Makefile.inc (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/arch/arm32/Makefile.inc (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -41,5 +41,6 @@ PAGE_SIZE = 4096 -RD_SRVS_ESSENTIAL += +RD_SRVS_ESSENTIAL += \ + $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser RD_SRVS_NON_ESSENTIAL += \ Index: boot/arch/mips32/src/Makefile =================================================================== --- boot/arch/mips32/src/Makefile (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/arch/mips32/src/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/arch/mips32/src/Makefile.build (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ boot/arch/mips32/src/Makefile.toolchain (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -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: contrib/conf/ia32-qe.sh =================================================================== --- contrib/conf/ia32-qe.sh (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ contrib/conf/ia32-qe.sh (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -5,5 +5,5 @@ # Create a disk image if it does not exist if [ ! -f "$DISK_IMG" ]; then - tools/mkfat.py uspace/dist/data "$DISK_IMG" + tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG" fi Index: contrib/conf/mips32-gx.sh =================================================================== --- contrib/conf/mips32-gx.sh (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ contrib/conf/mips32-gx.sh (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -5,5 +5,5 @@ # Create a disk image if it does not exist if [ ! -f "$DISK_IMG" ]; then - tools/mkfat.py uspace/dist/data "$DISK_IMG" + tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG" fi Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -120,4 +120,11 @@ ifeq ($(CONFIG_LTO),y) GCC_CFLAGS += -flto +endif + +ifeq ($(CONFIG_LINE_DEBUG),y) + GCC_CFLAGS += -g + ICC_CFLAGS += -g + SUNCC_CFLAGS += -g + CLANG_CFLAGS += -g endif @@ -401,5 +408,9 @@ $(DISASM): $(RAW) +ifeq ($(CONFIG_LINE_DEBUG),y) + $(OBJDUMP) -d -S $< > $@ +else $(OBJDUMP) -d $< > $@ +endif $(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS) Index: kernel/arch/amd64/_link.ld.in =================================================================== --- kernel/arch/amd64/_link.ld.in (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/amd64/_link.ld.in (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -53,4 +53,17 @@ } +#ifdef CONFIG_LINE_DEBUG + .comment 0 : { *(.comment); } + .debug_abbrev 0 : { *(.debug_abbrev); } + .debug_aranges 0 : { *(.debug_aranges); } + .debug_info 0 : { *(.debug_info); } + .debug_line 0 : { *(.debug_line); } + .debug_loc 0 : { *(.debug_loc); } + .debug_pubnames 0 : { *(.debug_pubnames); } + .debug_pubtypes 0 : { *(.debug_pubtypes); } + .debug_ranges 0 : { *(.debug_ranges); } + .debug_str 0 : { *(.debug_str); } +#endif + /DISCARD/ : { *(*); Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h =================================================================== --- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -105,4 +105,5 @@ extern void icp_get_memory_extents(uintptr_t *, uintptr_t *); extern void icp_frame_init(void); +extern size_t icp_get_irq_count(void); extern struct arm_machine_ops icp_machine_ops; Index: kernel/arch/arm32/include/mach/testarm/testarm.h =================================================================== --- kernel/arch/arm32/include/mach/testarm/testarm.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/include/mach/testarm/testarm.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -73,4 +73,5 @@ extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *); extern void gxemul_frame_init(void); +extern size_t gxemul_get_irq_count(void); extern struct arm_machine_ops gxemul_machine_ops; Index: kernel/arch/arm32/include/machine_func.h =================================================================== --- kernel/arch/arm32/include/machine_func.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/include/machine_func.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -55,4 +55,5 @@ void (*machine_output_init)(void); void (*machine_input_init)(void); + size_t (*machine_get_irq_count)(void); }; Index: kernel/arch/arm32/src/mach/gta02/gta02.c =================================================================== --- kernel/arch/arm32/src/mach/gta02/gta02.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/src/mach/gta02/gta02.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -43,4 +43,6 @@ #include #include +#include +#include #include #include @@ -68,4 +70,5 @@ static void gta02_output_init(void); static void gta02_input_init(void); +static size_t gta02_get_irq_count(void); static void gta02_timer_irq_init(void); @@ -74,6 +77,6 @@ static void gta02_timer_irq_handler(irq_t *irq); -static void *gta02_scons_out; -static s3c24xx_irqc_t *gta02_irqc; +static outdev_t *gta02_scons_dev; +static s3c24xx_irqc_t gta02_irqc; static s3c24xx_timer_t *gta02_timer; @@ -88,21 +91,17 @@ gta02_frame_init, gta02_output_init, - gta02_input_init + gta02_input_init, + gta02_get_irq_count }; static void gta02_init(void) { - gta02_scons_out = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE); - gta02_irqc = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE); + s3c24xx_irqc_regs_t *irqc_regs; + gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE); - - /* Make all interrupt sources use IRQ mode (not FIQ). */ - pio_write_32(>a02_irqc->intmod, 0x00000000); - - /* Disable all interrupt sources. */ - pio_write_32(>a02_irqc->intmsk, 0xffffffff); - - /* Disable interrupts from all sub-sources. */ - pio_write_32(>a02_irqc->intsubmsk, 0xffffffff); + irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE); + + /* Initialize interrupt controller. */ + s3c24xx_irqc_init(>a02_irqc, irqc_regs); } @@ -132,5 +131,9 @@ uint32_t inum; - inum = pio_read_32(>a02_irqc->intoffset); + /* Determine IRQ number. */ + inum = s3c24xx_irqc_inum_get(>a02_irqc); + + /* Clear interrupt condition in the interrupt controller. */ + s3c24xx_irqc_clear(>a02_irqc, inum); irq_t *irq = irq_dispatch_and_lock(inum); @@ -144,8 +147,4 @@ CPU->id, inum); } - - /* Clear interrupt condition in the interrupt controller. */ - pio_write_32(>a02_irqc->srcpnd, S3C24XX_INT_BIT(inum)); - pio_write_32(>a02_irqc->intpnd, S3C24XX_INT_BIT(inum)); } @@ -176,13 +175,55 @@ } #endif - outdev_t *scons_dev; - - scons_dev = s3c24xx_uart_init((ioport8_t *) gta02_scons_out); - if (scons_dev) - stdout_wire(scons_dev); + + /* Initialize serial port of the debugging console. */ + s3c24xx_uart_io_t *scons_io; + + scons_io = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE); + gta02_scons_dev = s3c24xx_uart_init(scons_io, S3C24XX_INT_UART2); + + if (gta02_scons_dev) { + /* Create output device. */ + stdout_wire(gta02_scons_dev); + } + + /* + * This is the necessary evil until the userspace driver is entirely + * self-sufficient. + */ + sysinfo_set_item_val("s3c24xx_uart", NULL, true); + sysinfo_set_item_val("s3c24xx_uart.inr", NULL, S3C24XX_INT_UART2); + sysinfo_set_item_val("s3c24xx_uart.address.physical", NULL, + (uintptr_t) GTA02_SCONS_BASE); + } static void gta02_input_init(void) { + s3c24xx_uart_t *scons_inst; + + if (gta02_scons_dev) { + /* Create input device. */ + scons_inst = (void *) gta02_scons_dev->data; + + srln_instance_t *srln_instance = srln_init(); + if (srln_instance) { + indev_t *sink = stdin_wire(); + indev_t *srln = srln_wire(srln_instance, sink); + s3c24xx_uart_input_wire(scons_inst, srln); + + /* Enable interrupts from UART2 */ + s3c24xx_irqc_src_enable(>a02_irqc, + S3C24XX_INT_UART2); + + /* Enable interrupts from UART2 RXD */ + s3c24xx_irqc_subsrc_enable(>a02_irqc, + S3C24XX_SUBINT_RXD2); + } + } +} + +size_t gta02_get_irq_count(void) +{ + return GTA02_IRQ_COUNT; } @@ -248,6 +289,5 @@ /* Enable interrupts from timer0 */ - pio_write_32(>a02_irqc->intmsk, pio_read_32(>a02_irqc->intmsk) & - ~S3C24XX_INT_BIT(S3C24XX_INT_TIMER0)); + s3c24xx_irqc_src_enable(>a02_irqc, S3C24XX_INT_TIMER0); /* Load data from tcntb0/tcmpb0 into tcnt0/tcmp0. */ Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c =================================================================== --- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -64,5 +64,6 @@ icp_frame_init, icp_output_init, - icp_input_init + icp_input_init, + icp_get_irq_count }; @@ -336,4 +337,8 @@ } +size_t icp_get_irq_count(void) +{ + return ICP_IRQ_COUNT; +} /** @} Index: kernel/arch/arm32/src/mach/testarm/testarm.c =================================================================== --- kernel/arch/arm32/src/mach/testarm/testarm.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/src/mach/testarm/testarm.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -64,5 +64,6 @@ gxemul_frame_init, gxemul_output_init, - gxemul_input_init + gxemul_input_init, + gxemul_get_irq_count }; @@ -126,4 +127,9 @@ } +size_t gxemul_get_irq_count(void) +{ + return GXEMUL_IRQ_COUNT; +} + /** Starts gxemul Real Time Clock device, which asserts regular interrupts. * Index: kernel/arch/arm32/src/machine_func.c =================================================================== --- kernel/arch/arm32/src/machine_func.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/arm32/src/machine_func.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -128,16 +128,5 @@ size_t machine_get_irq_count(void) { - size_t irq_count; - -#if defined(MACHINE_gta02) - irq_count = GTA02_IRQ_COUNT; -#elif defined(MACHINE_testarm) - irq_count = GXEMUL_IRQ_COUNT; -#elif defined(MACHINE_integratorcp) - irq_count = ICP_IRQ_COUNT; -#else -#error Machine type not defined. -#endif - return irq_count; + return (machine_ops->machine_get_irq_count)(); } Index: kernel/arch/ia32/src/mm/frame.c =================================================================== --- kernel/arch/ia32/src/mm/frame.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/arch/ia32/src/mm/frame.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -131,7 +131,14 @@ if (last_frame < ALIGN_UP(new_base + new_size, FRAME_SIZE)) last_frame = ALIGN_UP(new_base + new_size, FRAME_SIZE); - } - - if (e820table[i].type == MEMMAP_MEMORY_RESERVED) { + } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) || + (e820table[i].type == MEMMAP_MEMORY_NVS)) { + /* To be safe, make the firmware zone possibly larger */ + uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE); + uint64_t new_size = ALIGN_UP(size + (base - new_base), + FRAME_SIZE); + + zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0, + ZONE_FIRMWARE); + } else { /* To be safe, make the reserved zone possibly larger */ uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE); @@ -141,14 +148,4 @@ zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0, ZONE_RESERVED); - } - - if (e820table[i].type == MEMMAP_MEMORY_ACPI) { - /* To be safe, make the firmware zone possibly larger */ - uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE); - uint64_t new_size = ALIGN_UP(size + (base - new_base), - FRAME_SIZE); - - zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0, - ZONE_FIRMWARE); } } @@ -203,5 +200,5 @@ #ifdef CONFIG_SMP /* Reserve AP real mode bootstrap memory */ - frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, + frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH); Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/genarch/Makefile.inc (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -90,4 +90,9 @@ endif +ifeq ($(CONFIG_S3C24XX_IRQC),y) + GENARCH_SOURCES += \ + genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c +endif + ifeq ($(CONFIG_S3C24XX_UART),y) GENARCH_SOURCES += \ Index: kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h =================================================================== --- kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -53,5 +53,5 @@ ioport32_t subsrcpnd; /**< Sub source pending */ ioport32_t intsubmsk; /** Interrupt sub mask */ -} s3c24xx_irqc_t; +} s3c24xx_irqc_regs_t; /** S3C24xx Interrupt source numbers. @@ -120,4 +120,16 @@ #define S3C24XX_SUBINT_BIT(subsource) (1 << (subsource)) +typedef struct { + s3c24xx_irqc_regs_t *regs; +} s3c24xx_irqc_t; + +extern void s3c24xx_irqc_init(s3c24xx_irqc_t *, s3c24xx_irqc_regs_t *); +extern unsigned s3c24xx_irqc_inum_get(s3c24xx_irqc_t *); +extern void s3c24xx_irqc_clear(s3c24xx_irqc_t *, unsigned); +extern void s3c24xx_irqc_src_enable(s3c24xx_irqc_t *, unsigned); +extern void s3c24xx_irqc_src_disable(s3c24xx_irqc_t *, unsigned); +extern void s3c24xx_irqc_subsrc_enable(s3c24xx_irqc_t *, unsigned); +extern void s3c24xx_irqc_subsrc_disable(s3c24xx_irqc_t *, unsigned); + #endif Index: kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h =================================================================== --- kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -38,8 +38,36 @@ #define KERN_S3C24XX_UART_H_ +#include +#include #include -#include -extern outdev_t *s3c24xx_uart_init(ioport8_t *); +/** S3C24xx UART I/O */ +typedef struct { + uint32_t ulcon; + uint32_t ucon; + uint32_t ufcon; + uint32_t umcon; + + uint32_t utrstat; + uint32_t uerstat; + uint32_t ufstat; + uint32_t umstat; + + uint32_t utxh; + uint32_t urxh; + + uint32_t ubrdiv; +} s3c24xx_uart_io_t; + +/** S3C24xx UART instance */ +typedef struct { + s3c24xx_uart_io_t *io; + indev_t *indev; + irq_t irq; +} s3c24xx_uart_t; + +extern outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *, inr_t inr); +extern void s3c24xx_uart_input_wire(s3c24xx_uart_t *, + indev_t *); #endif Index: kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c =================================================================== --- kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) +++ kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2010 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 genarch + * @{ + */ +/** + * @file + * @brief Samsung S3C24xx on-chip interrupt controller. + * + * This IRQC is present on the Samsung S3C24xx CPU (on the gta02 platform). + */ + +#include +#include + +/** Correspondence between interrupt sources and sub-sources. */ +static unsigned s3c24xx_subsrc_src[][2] = { + { S3C24XX_SUBINT_CAM_P, S3C24XX_INT_CAM }, + { S3C24XX_SUBINT_CAM_C, S3C24XX_INT_CAM }, + { S3C24XX_SUBINT_ADC_S, S3C24XX_INT_ADC }, + { S3C24XX_SUBINT_TC, S3C24XX_INT_ADC }, + { S3C24XX_SUBINT_ERR2, S3C24XX_INT_UART2 }, + { S3C24XX_SUBINT_TXD2, S3C24XX_INT_UART2 }, + { S3C24XX_SUBINT_RXD2, S3C24XX_INT_UART2 }, + { S3C24XX_SUBINT_ERR1, S3C24XX_INT_UART1 }, + { S3C24XX_SUBINT_TXD1, S3C24XX_INT_UART1 }, + { S3C24XX_SUBINT_RXD1, S3C24XX_INT_UART1 }, + { S3C24XX_SUBINT_ERR0, S3C24XX_INT_UART0 }, + { S3C24XX_SUBINT_TXD0, S3C24XX_INT_UART0 }, + { S3C24XX_SUBINT_RXD0, S3C24XX_INT_UART0 } +}; + +/** Initialize S3C24xx interrupt controller. + * + * @param irqc Instance structure + * @param regs Register I/O structure + */ +void s3c24xx_irqc_init(s3c24xx_irqc_t *irqc, s3c24xx_irqc_regs_t *regs) +{ + irqc->regs = regs; + + /* Make all interrupt sources use IRQ mode (not FIQ). */ + pio_write_32(®s->intmod, 0x00000000); + + /* Disable all interrupt sources. */ + pio_write_32(®s->intmsk, 0xffffffff); + + /* Disable interrupts from all sub-sources. */ + pio_write_32(®s->intsubmsk, 0xffffffff); +} + +/** Obtain number of pending interrupt. */ +unsigned s3c24xx_irqc_inum_get(s3c24xx_irqc_t *irqc) +{ + return pio_read_32(&irqc->regs->intoffset); +} + +/** Clear pending interrupt condition including sub-sources. + * + * Clear source and interrupt pending condition and also automatically clear + * any sub-source pending condition pertaining to the source. + */ +void s3c24xx_irqc_clear(s3c24xx_irqc_t *irqc, unsigned inum) +{ + unsigned src, subsrc; + unsigned entries, i; + + entries = sizeof(s3c24xx_subsrc_src) / sizeof(s3c24xx_subsrc_src[0]); + + for (i = 0; i < entries; i++) { + subsrc = s3c24xx_subsrc_src[i][0]; + src = s3c24xx_subsrc_src[i][1]; + + if (src == inum) { + pio_write_32(&irqc->regs->subsrcpnd, + S3C24XX_SUBINT_BIT(subsrc)); + } + } + + pio_write_32(&irqc->regs->srcpnd, S3C24XX_INT_BIT(inum)); + pio_write_32(&irqc->regs->intpnd, S3C24XX_INT_BIT(inum)); +} + +/** Enable interrupts from the specified source. */ +void s3c24xx_irqc_src_enable(s3c24xx_irqc_t *irqc, unsigned src) +{ + pio_write_32(&irqc->regs->intmsk, pio_read_32(&irqc->regs->intmsk) & + ~S3C24XX_INT_BIT(src)); +} + +/** Disable interrupts from the specified source. */ +void s3c24xx_irqc_src_disable(s3c24xx_irqc_t *irqc, unsigned src) +{ + pio_write_32(&irqc->regs->intmsk, pio_read_32(&irqc->regs->intmsk) | + S3C24XX_INT_BIT(src)); +} + +/** Enable interrupts from the specified sub-source. */ +void s3c24xx_irqc_subsrc_enable(s3c24xx_irqc_t *irqc, unsigned subsrc) +{ + pio_write_32(&irqc->regs->intsubmsk, + pio_read_32(&irqc->regs->intsubmsk) & + ~S3C24XX_SUBINT_BIT(subsrc)); +} + +/** Disable interrupts from the specified sub-source. */ +void s3c24xx_irqc_subsrc_disable(s3c24xx_irqc_t *irqc, unsigned subsrc) +{ + pio_write_32(&irqc->regs->intsubmsk, + pio_read_32(&irqc->regs->intsubmsk) | + S3C24XX_SUBINT_BIT(subsrc)); +} + +/** @} + */ Index: kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -40,35 +40,29 @@ #include #include +#include +#include #include #include -#include #include #include -/** S3C24xx UART register offsets */ -#define S3C24XX_UTRSTAT 0x10 -#define S3C24XX_UTXH 0x20 +/* Bits in UTRSTAT register */ +#define S3C24XX_UTRSTAT_TX_EMPTY 0x4 +#define S3C24XX_UTRSTAT_RDATA 0x1 -/* Bits in UTXH register */ -#define S3C24XX_UTXH_TX_EMPTY 0x4 - -typedef struct { - ioport8_t *base; -} s3c24xx_uart_instance_t; +#define S3C24XX_UFSTAT_TX_FULL 0x4000 +#define S3C24XX_UFSTAT_RX_FULL 0x0040 +#define S3C24XX_UFSTAT_RX_COUNT 0x002f static void s3c24xx_uart_sendb(outdev_t *dev, uint8_t byte) { - s3c24xx_uart_instance_t *instance = - (s3c24xx_uart_instance_t *) dev->data; - ioport32_t *utrstat, *utxh; + s3c24xx_uart_t *uart = + (s3c24xx_uart_t *) dev->data; - utrstat = (ioport32_t *) (instance->base + S3C24XX_UTRSTAT); - utxh = (ioport32_t *) (instance->base + S3C24XX_UTXH); - - /* Wait for transmitter to be empty. */ - while ((pio_read_32(utrstat) & S3C24XX_UTXH_TX_EMPTY) == 0) + /* Wait for space becoming available in Tx FIFO. */ + while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_TX_FULL) != 0) ; - pio_write_32(utxh, byte); + pio_write_32(&uart->io->utxh, byte); } @@ -86,4 +80,20 @@ } +static irq_ownership_t s3c24xx_uart_claim(irq_t *irq) +{ + return IRQ_ACCEPT; +} + +static void s3c24xx_uart_irq_handler(irq_t *irq) +{ + s3c24xx_uart_t *uart = irq->instance; + + while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_RX_COUNT) != 0) { + uint32_t data = pio_read_32(&uart->io->urxh); + pio_read_32(&uart->io->uerstat); + indev_push_character(uart->indev, data & 0xff); + } +} + static outdev_operations_t s3c24xx_uart_ops = { .write = s3c24xx_uart_putchar, @@ -91,5 +101,5 @@ }; -outdev_t *s3c24xx_uart_init(ioport8_t *base) +outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *io, inr_t inr) { outdev_t *uart_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC); @@ -97,7 +107,7 @@ return NULL; - s3c24xx_uart_instance_t *instance = - malloc(sizeof(s3c24xx_uart_instance_t), FRAME_ATOMIC); - if (!instance) { + s3c24xx_uart_t *uart = + malloc(sizeof(s3c24xx_uart_t), FRAME_ATOMIC); + if (!uart) { free(uart_dev); return NULL; @@ -105,7 +115,23 @@ outdev_initialize("s3c24xx_uart_dev", uart_dev, &s3c24xx_uart_ops); - uart_dev->data = instance; + uart_dev->data = uart; - instance->base = base; + uart->io = io; + uart->indev = NULL; + + /* Initialize IRQ structure. */ + irq_initialize(&uart->irq); + uart->irq.devno = device_assign_devno(); + uart->irq.inr = inr; + uart->irq.claim = s3c24xx_uart_claim; + uart->irq.handler = s3c24xx_uart_irq_handler; + uart->irq.instance = uart; + + /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */ + pio_write_32(&uart->io->ufcon, 0x01); + + /* Set RX interrupt to pulse mode */ + pio_write_32(&uart->io->ucon, + pio_read_32(&uart->io->ucon) & ~(1 << 8)); if (!fb_exported) { @@ -116,5 +142,5 @@ sysinfo_set_item_val("fb", NULL, true); sysinfo_set_item_val("fb.kind", NULL, 3); - sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(base)); + sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(io)); fb_exported = true; @@ -124,4 +150,13 @@ } +void s3c24xx_uart_input_wire(s3c24xx_uart_t *uart, indev_t *indev) +{ + ASSERT(uart); + ASSERT(indev); + + uart->indev = indev; + irq_register(&uart->irq); +} + /** @} */ Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ kernel/generic/src/mm/frame.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -161,6 +161,7 @@ for (j = zones.count; j > i; j--) { zones.info[j] = zones.info[j - 1]; - zones.info[j].buddy_system->data = - (void *) &zones.info[j - 1]; + if (zones.info[j].buddy_system != NULL) + zones.info[j].buddy_system->data = + (void *) &zones.info[j]; } @@ -762,6 +763,7 @@ for (i = z2 + 1; i < zones.count; i++) { zones.info[i - 1] = zones.info[i]; - zones.info[i - 1].buddy_system->data = - (void *) &zones.info[i - 1]; + if (zones.info[i - 1].buddy_system != NULL) + zones.info[i - 1].buddy_system->data = + (void *) &zones.info[i - 1]; } Index: tools/mkfat.py =================================================================== --- tools/mkfat.py (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ tools/mkfat.py (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -343,12 +343,18 @@ def usage(prname): "Print usage syntax" - print prname + " " + print prname + " " def main(): - if (len(sys.argv) < 3): + if (len(sys.argv) < 4): usage(sys.argv[0]) return - path = os.path.abspath(sys.argv[1]) + if (not sys.argv[1].isdigit()): + print " must be a number" + return + + extra_bytes = int(sys.argv[1]) + + path = os.path.abspath(sys.argv[2]) if (not os.path.isdir(path)): print " must be a directory" @@ -365,9 +371,9 @@ # Make sure the filesystem is large enought for FAT16 - size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes while (size / cluster_size < fat16_clusters): if (cluster_size > sector_size): cluster_size /= 2 - size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes else: size = fat16_clusters * cluster_size + reserved_clusters * cluster_size @@ -381,5 +387,5 @@ data_start = root_start + root_size - outf = file(sys.argv[2], "w") + outf = file(sys.argv[3], "w") boot_sector = xstruct.create(BOOT_SECTOR) Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -69,4 +69,5 @@ srv/hid/kbd \ srv/hw/char/i8042 \ + srv/hw/char/s3c24xx_uart \ srv/hw/netif/dp8390 \ srv/net/cfg \ Index: uspace/Makefile.common =================================================================== --- uspace/Makefile.common (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/Makefile.common (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -172,5 +172,9 @@ ifneq ($(BINARY),) %.disasm: $(BINARY) +ifeq ($(CONFIG_LINE_DEBUG),y) + $(OBJDUMP) -d -S $< > $@ +else $(OBJDUMP) -d $< > $@ +endif $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS) Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/app/init/init.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -274,4 +274,5 @@ srv_start("/srv/cuda_adb"); srv_start("/srv/i8042"); + srv_start("/srv/s3c24ser"); srv_start("/srv/adb_ms"); srv_start("/srv/char_ms"); Index: uspace/app/klog/klog.c =================================================================== --- uspace/app/klog/klog.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/app/klog/klog.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -43,11 +43,15 @@ #include #include +#include #include -#define NAME "klog" +#define NAME "klog" +#define LOG_FNAME "/log/klog" /* Pointer to klog area */ static wchar_t *klog; static size_t klog_length; + +static FILE *log; static void interrupt_received(ipc_callid_t callid, ipc_call_t *call) @@ -58,6 +62,17 @@ size_t i; - for (i = klog_len - klog_stored; i < klog_len; i++) - putchar(klog[(klog_start + i) % klog_length]); + for (i = klog_len - klog_stored; i < klog_len; i++) { + wchar_t ch = klog[(klog_start + i) % klog_length]; + + putchar(ch); + + if (log != NULL) + fputc(ch, log); + } + + if (log != NULL) { + fflush(log); + fsync(fileno(log)); + } } @@ -91,4 +106,14 @@ } + /* + * Mode "a" would be definitively much better here, but it is + * not well supported by the FAT driver. + * + */ + log = fopen(LOG_FNAME, "w"); + if (log == NULL) + printf("%s: Unable to create log file %s (%s)\n", NAME, LOG_FNAME, + str_error(errno)); + async_set_interrupt_received(interrupt_received); klog_update(); Index: pace/lib/c/Makefile.toolchain =================================================================== --- uspace/lib/c/Makefile.toolchain (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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: pace/lib/c/arch/ia64/include/limits.h =================================================================== --- uspace/lib/c/arch/ia64/include/limits.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/lib/c/generic/io/io.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -757,4 +757,14 @@ } +int fileno(FILE *stream) +{ + if (stream->klog) { + errno = EBADF; + return -1; + } + + return stream->fd; +} + int fphone(FILE *stream) { Index: pace/lib/c/include/limits.h =================================================================== --- uspace/lib/c/include/limits.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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: uspace/lib/c/include/stdio.h =================================================================== --- uspace/lib/c/include/stdio.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/lib/c/include/stdio.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -171,4 +171,5 @@ extern off64_t ftell(FILE *); extern int feof(FILE *); +extern int fileno(FILE *); extern int fflush(FILE *); Index: pace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/srv/fs/fat/fat_ops.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -1527,6 +1527,25 @@ void fat_sync(ipc_callid_t rid, ipc_call_t *request) { - /* Dummy implementation */ - ipc_answer_0(rid, EOK); + dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request); + fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request); + + fs_node_t *fn; + int rc = fat_node_get(&fn, dev_handle, index); + if (rc != EOK) { + ipc_answer_0(rid, rc); + return; + } + if (!fn) { + ipc_answer_0(rid, ENOENT); + return; + } + + fat_node_t *nodep = FAT_NODE(fn); + + nodep->dirty = true; + rc = fat_node_sync(nodep); + + fat_node_put(fn); + ipc_answer_0(rid, rc); } Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -736,5 +736,8 @@ void tmpfs_sync(ipc_callid_t rid, ipc_call_t *request) { - /* Dummy implementation */ + /* + * TMPFS keeps its data structures always consistent, + * thus the sync operation is a no-op. + */ ipc_answer_0(rid, EOK); } Index: uspace/srv/hid/kbd/Makefile =================================================================== --- uspace/srv/hid/kbd/Makefile (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/srv/hid/kbd/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -60,6 +60,6 @@ ifeq ($(MACHINE),gta02) SOURCES += \ - port/dummy.c \ - ctl/pc.c + port/chardev.c \ + ctl/stty.c endif ifeq ($(MACHINE),testarm) Index: uspace/srv/hid/kbd/port/chardev.c =================================================================== --- uspace/srv/hid/kbd/port/chardev.c (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ uspace/srv/hid/kbd/port/chardev.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -41,4 +41,5 @@ #include #include +#include #include #include @@ -50,21 +51,41 @@ #define NAME "kbd" +/** List of devices to try connecting to. */ +static const char *in_devs[] = { + "/dev/char/ps2a", + "/dev/char/s3c24ser" +}; + +static const int num_devs = sizeof(in_devs) / sizeof(in_devs[0]); + int kbd_port_init(void) { - const char *input = "/dev/char/ps2a"; int input_fd; + int i; - printf(NAME ": open %s\n", input); + input_fd = -1; + for (i = 0; i < num_devs; i++) { + struct stat s; - input_fd = open(input, O_RDONLY); + if (stat(in_devs[i], &s) == EOK) + break; + } + + if (i >= num_devs) { + printf(NAME ": Could not find any suitable input device.\n"); + return -1; + } + + input_fd = open(in_devs[i], O_RDONLY); if (input_fd < 0) { - printf(NAME ": Failed opening %s (%d)\n", input, input_fd); - return false; + printf(NAME ": failed opening device %s (%d).\n", in_devs[i], + input_fd); + return -1; } dev_phone = fd_phone(input_fd); if (dev_phone < 0) { - printf(NAME ": Failed to connect to device\n"); - return false; + printf(NAME ": Failed connecting to device\n"); + return -1; } @@ -73,5 +94,5 @@ if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) { printf(NAME ": Failed to create callback from device\n"); - return false; + return -1; } Index: pace/srv/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision 4637c72da21ae63d19637654eb772d0cdae5841a) +++ (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/char/s3c24xx_uart/Makefile =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) +++ uspace/srv/hw/char/s3c24xx_uart/Makefile (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -0,0 +1,38 @@ +# +# 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. +# + +USPACE_PREFIX = ../../../.. + +# Need to use short name because of FAT 8+3 limit +BINARY = s3c24ser + +SOURCES = \ + s3c24xx_uart.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -0,0 +1,224 @@ +/* + * Copyright (c) 2010 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 driver_serial + * @{ + */ +/** + * @file + * @brief Samsung S3C24xx on-chip UART driver. + * + * This UART is present on the Samsung S3C24xx CPU (on the gta02 platform). + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "s3c24xx_uart.h" + +#define NAME "s3c24ser" +#define NAMESPACE "char" + +/* Bits in UTRSTAT register */ +#define S3C24XX_UTRSTAT_TX_EMPTY 0x4 +#define S3C24XX_UTRSTAT_RDATA 0x1 + +/* Bits in UFSTAT register */ +#define S3C24XX_UFSTAT_TX_FULL 0x4000 +#define S3C24XX_UFSTAT_RX_FULL 0x0040 +#define S3C24XX_UFSTAT_RX_COUNT 0x002f + +static irq_cmd_t uart_irq_cmds[] = { + { + .cmd = CMD_ACCEPT + } +}; + +static irq_code_t uart_irq_code = { + sizeof(uart_irq_cmds) / sizeof(irq_cmd_t), + uart_irq_cmds +}; + +/** S3C24xx UART instance structure */ +static s3c24xx_uart_t *uart; + +static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall); +static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call); +static int s3c24xx_uart_init(s3c24xx_uart_t *uart); +static void s3c24xx_uart_sendb(s3c24xx_uart_t *uart, uint8_t byte); + +int main(int argc, char *argv[]) +{ + int rc; + + printf(NAME ": S3C24xx on-chip UART driver\n"); + + rc = devmap_driver_register(NAME, s3c24xx_uart_connection); + if (rc < 0) { + printf(NAME ": Unable to register driver.\n"); + return -1; + } + + uart = malloc(sizeof(s3c24xx_uart_t)); + if (uart == NULL) + return -1; + + if (s3c24xx_uart_init(uart) != EOK) + return -1; + + rc = devmap_device_register(NAMESPACE "/" NAME, &uart->dev_handle); + if (rc != EOK) { + devmap_hangup_phone(DEVMAP_DRIVER); + printf(NAME ": Unable to register device %s.\n"); + return -1; + } + + printf(NAME ": Registered device %s.\n", NAMESPACE "/" NAME); + + printf(NAME ": Accepting connections\n"); + task_retval(0); + async_manager(); + + /* Not reached */ + return 0; +} + +/** Character device connection handler. */ +static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + ipc_call_t call; + ipcarg_t method; + int retval; + + /* Answer the IPC_M_CONNECT_ME_TO call. */ + ipc_answer_0(iid, EOK); + + while (1) { + callid = async_get_call(&call); + method = IPC_GET_METHOD(call); + switch (method) { + case IPC_M_PHONE_HUNGUP: + /* The other side has hung up. */ + ipc_answer_0(callid, EOK); + return; + case IPC_M_CONNECT_TO_ME: + printf(NAME ": creating callback connection\n"); + uart->client_phone = IPC_GET_ARG5(call); + retval = 0; + break; + case CHAR_WRITE_BYTE: + printf(NAME ": write %d to device\n", + IPC_GET_ARG1(call)); + s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call)); + retval = 0; + break; + default: + retval = EINVAL; + break; + } + ipc_answer_0(callid, retval); + } +} + +static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call) +{ + (void) iid; (void) call; + + while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_RX_COUNT) != 0) { + uint32_t data = pio_read_32(&uart->io->urxh) & 0xff; + uint32_t status = pio_read_32(&uart->io->uerstat); + + if (uart->client_phone != -1) { + async_msg_1(uart->client_phone, CHAR_NOTIF_BYTE, + data); + } + + if (status & 0x0f) + printf(NAME ": Error status 0x%x\n", status); + } +} + +/** Initialize S3C24xx on-chip UART. */ +static int s3c24xx_uart_init(s3c24xx_uart_t *uart) +{ + void *vaddr; + sysarg_t inr; + + if (sysinfo_get_value("s3c24xx_uart.address.physical", + &uart->paddr) != EOK) + return -1; + + if (pio_enable((void *) uart->paddr, sizeof(s3c24xx_uart_io_t), + &vaddr) != 0) + return -1; + + if (sysinfo_get_value("s3c24xx_uart.inr", &inr) != EOK) + return -1; + + uart->io = vaddr; + uart->client_phone = -1; + + printf(NAME ": device at physical address 0x%x, inr %d.\n", + uart->paddr, inr); + + async_set_interrupt_received(s3c24xx_uart_irq_handler); + + ipc_register_irq(inr, device_assign_devno(), 0, &uart_irq_code); + + /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */ + pio_write_32(&uart->io->ufcon, 0x01); + + /* Set RX interrupt to pulse mode */ + pio_write_32(&uart->io->ucon, + pio_read_32(&uart->io->ucon) & ~(1 << 8)); + + return EOK; +} + +/** Send a byte to the UART. */ +static void s3c24xx_uart_sendb(s3c24xx_uart_t *uart, uint8_t byte) +{ + /* Wait for space becoming available in Tx FIFO. */ + while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_TX_FULL) != 0) + ; + + pio_write_32(&uart->io->utxh, byte); +} + +/** @} + */ Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (revision 482dde7c4c1b458613620fd9c5f0aced82a926ff) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2010 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 genarch + * @{ + */ +/** + * @file + * @brief Samsung S3C24xx on-chip UART driver. + */ + +#ifndef S3C24XX_UART_H_ +#define S3C24XX_UART_H_ + +#include + +/** S3C24xx UART I/O */ +typedef struct { + uint32_t ulcon; + uint32_t ucon; + uint32_t ufcon; + uint32_t umcon; + + uint32_t utrstat; + uint32_t uerstat; + uint32_t ufstat; + uint32_t umstat; + + uint32_t utxh; + uint32_t urxh; + + uint32_t ubrdiv; +} s3c24xx_uart_io_t; + +/** S3C24xx UART instance */ +typedef struct { + /** Physical device address */ + uintptr_t paddr; + + /** Device I/O structure */ + s3c24xx_uart_io_t *io; + + /** Callback phone to the client */ + int client_phone; + + /** Device handle */ + dev_handle_t dev_handle; +} s3c24xx_uart_t; + +#endif + +/** @} + */