Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset b535aeb in mainline


Ignore:
Timestamp:
2010-03-20T22:02:05Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
37f527b
Parents:
39e8406 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Files:
1 added
2 deleted
75 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Include configuration
    30 #
    31 
    3229CSCOPE = cscope
    3330CONFIG = tools/config.py
     31AUTOTOOL = tools/autotool.py
     32SANDBOX = autotool
    3433
    35 .PHONY: all config config_default distclean clean cscope precheck
     34CONFIG_RULES = HelenOS.config
    3635
    37 all: Makefile.config config.h config.defs
     36COMMON_MAKEFILE = Makefile.common
     37COMMON_HEADER = common.h
     38COMMON_HEADER_PREV = $(COMMON_HEADER).prev
     39
     40CONFIG_MAKEFILE = Makefile.config
     41CONFIG_HEADER = config.h
     42
     43.PHONY: all precheck cscope autotool config_default config distclean clean
     44
     45all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
     46        cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
    3847        $(MAKE) -C kernel PRECHECK=$(PRECHECK)
    3948        $(MAKE) -C uspace PRECHECK=$(PRECHECK)
     
    4655        find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
    4756
    48 Makefile.config: config_default
     57$(COMMON_MAKEFILE): autotool
     58$(COMMON_HEADER): autotool
    4959
    50 config.h: config_default
     60autotool: $(CONFIG_MAKEFILE)
     61        $(AUTOTOOL)
     62        -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
    5163
    52 config.defs: config_default
     64$(CONFIG_MAKEFILE): config_default
     65$(CONFIG_HEADER): config_default
    5366
    54 config_default: HelenOS.config
    55         $(CONFIG) HelenOS.config default
     67config_default: $(CONFIG_RULES)
     68        $(CONFIG) $< default
    5669
    57 config: HelenOS.config
    58         $(CONFIG) HelenOS.config
     70config: $(CONFIG_RULES)
     71        $(CONFIG) $<
    5972
    6073distclean: clean
    61         rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc tools/checkers/*.pyc
     74        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc
    6275
    6376clean:
     77        rm -fr $(SANDBOX)
    6478        $(MAKE) -C kernel clean
    6579        $(MAKE) -C uspace clean
  • boot/Makefile

    r39e8406 rb535aeb  
    3030#
    3131
     32-include ../Makefile.common
    3233-include ../Makefile.config
    33 -include ../config.defs
    3434
    3535## Paths
     
    4242.PHONY: all build clean generic_clean
    4343
    44 all: ../Makefile.config ../config.h ../config.defs build
     44all: ../Makefile.common ../Makefile.config ../config.h build
    4545
    4646-include arch/$(BARCH)/Makefile.inc
  • boot/Makefile.common

    r39e8406 rb535aeb  
    2727#
    2828
     29-include ../Makefile.common
    2930-include ../Makefile.config
    3031
  • boot/arch/arm32/loader/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     34all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • boot/arch/arm32/loader/Makefile.build

    r39e8406 rb535aeb  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    35 include ../../../../config.defs
    3636include Makefile.common
    3737include Makefile.toolchain
  • boot/arch/arm32/loader/Makefile.toolchain

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_NAME = elf32-littlearm
    3730BFD_ARCH = arm
    38 TARGET = arm-linux-gnu
    39 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    4031
    4132JOBFILE = ../../../../tools/jobfile.py
    42 
    43 ifeq ($(COMPILER),gcc_native)
    44         CC = gcc
    45         AS = as
    46         LD = ld
    47         OBJCOPY = objcopy
    48         OBJDUMP = objdump
    49 endif
    50 
    51 ifeq ($(COMPILER),gcc_cross)
    52         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    53         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    54         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    55         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    56         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    57 endif
    5833
    5934CFLAGS = \
  • boot/arch/ia64/loader/Makefile

    r39e8406 rb535aeb  
    2929
    3030include Makefile.common
     31include ../../../../Makefile.common
    3132include ../../../../Makefile.config
    3233
    3334.PHONY: all clean
    3435
    35 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     36all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
    3637        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3738        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • boot/arch/ia64/loader/Makefile.build

    r39e8406 rb535aeb  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    35 include ../../../../config.defs
    3636include Makefile.common
    3737include Makefile.toolchain
     
    6060$(OUTPUT): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
    6161        $(LD) -no-check-sections -N -T $(LINK) $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
    62         $(MAKE) -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     62        $(MAKE) -C gefi/HelenOS
    6363        cp gefi/HelenOS/hello.efi ../../../../
    6464        cp gefi/HelenOS/image.bin ../../../../
  • boot/arch/ia64/loader/Makefile.common

    r39e8406 rb535aeb  
    3131#
    3232
     33include ../../../../Makefile.common
    3334include ../../../../Makefile.config
    3435include ../../../Makefile.common
  • boot/arch/ia64/loader/Makefile.toolchain

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_NAME = elf64-ia64-little
    3730BFD_ARCH = ia64
    38 TARGET = ia64-pc-linux-gnu
    39 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    4031
    4132JOBFILE = ../../../../tools/jobfile.py
    42 
    43 ifeq ($(COMPILER),gcc_native)
    44         CC = gcc
    45         AS = as
    46         LD = ld
    47         OBJCOPY = objcopy
    48         OBJDUMP = objdump
    49         GEFI_PREFIX =
    50 endif
    51 
    52 ifeq ($(COMPILER),icc)
    53         CC = icc
    54         AS = as
    55         LD = ld
    56         OBJCOPY = objcopy
    57         OBJDUMP = objdump
    58         GEFI_PREFIX =
    59 endif
    60 
    61 ifeq ($(COMPILER),gcc_cross)
    62         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    63         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    64         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    65         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    66         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    67         GEFI_PREFIX = $(TOOLCHAIN_DIR)/$(TARGET)-
    68 endif
    6933
    7034CFLAGS = \
  • boot/arch/ia64/loader/gefi/HelenOS/Makefile

    r39e8406 rb535aeb  
    2222#
    2323
    24 prefix=$(PREFIX)
    2524include ../Make.defaults
    2625CDIR=$(TOPDIR)/..
     
    6968
    7069gefi:
    71         $(MAKE) -C .. prefix=$(PREFIX)
     70        $(MAKE) -C ..
  • boot/arch/ia64/loader/gefi/Make.defaults

    r39e8406 rb535aeb  
    2626# lib and include under the root
    2727#
     28
     29include ../../../../../Makefile.common
     30
    2831INSTALLROOT=/usr/local
    2932
     
    3134
    3235ARCH       = ia64
    33 INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol 
     36INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
    3437CPPFLAGS   = -DCONFIG_$(ARCH)
    3538CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
    3639LDFLAGS    = -nostdlib
    3740INSTALL    = install
    38 
    39 CC         = $(prefix)gcc
    40 AS         = $(prefix)as
    41 LD         = $(prefix)ld
    42 AR         = $(prefix)ar
    43 RANLIB     = $(prefix)ranlib
    44 OBJCOPY    = $(prefix)objcopy
    45 OBJDUMP    = $(prefix)objdump
  • boot/arch/mips32/loader/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     34all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • boot/arch/mips32/loader/Makefile.build

    r39e8406 rb535aeb  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    35 include ../../../../config.defs
    3636include Makefile.common
    3737include Makefile.toolchain
  • boot/arch/mips32/loader/Makefile.toolchain

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_ARCH = mips
    37 TARGET = mipsel-linux-gnu
    38 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    3930
    4031JOBFILE = ../../../../tools/jobfile.py
     
    4839        BFD_NAME = elf32-tradbigmips
    4940        BFD = ecoff-bigmips
    50         TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    51         TARGET = mips-linux-gnu
    5241endif
    5342
     
    5544        BFD_NAME = elf32-tradlittlemips
    5645        BFD = binary
    57 endif
    58 
    59 ifeq ($(COMPILER),gcc_native)
    60         CC = gcc
    61         AS = as
    62         LD = ld
    63         OBJCOPY = objcopy
    64         OBJDUMP = objdump
    65 endif
    66 
    67 ifeq ($(COMPILER),gcc_cross)
    68         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    69         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    70         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    71         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    72         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    7346endif
    7447
  • boot/arch/ppc32/loader/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     34all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • boot/arch/ppc32/loader/Makefile.build

    r39e8406 rb535aeb  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    35 include ../../../../config.defs
    3636include Makefile.common
    3737include Makefile.toolchain
  • boot/arch/ppc32/loader/Makefile.toolchain

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_NAME = elf32-powerpc
    3730BFD_ARCH = powerpc:common
    38 TARGET = ppc-linux-gnu
    39 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    4031
    4132JOBFILE = ../../../../tools/jobfile.py
    42 
    43 ifeq ($(COMPILER),gcc_native)
    44         CC = gcc
    45         AS = as
    46         LD = ld
    47         OBJCOPY = objcopy
    48         OBJDUMP = objdump
    49 endif
    50 
    51 ifeq ($(COMPILER),gcc_cross)
    52         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    53         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    54         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    55         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    56         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    57 endif
    5833
    5934CFLAGS = \
  • boot/arch/sparc64/loader/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     34all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • boot/arch/sparc64/loader/Makefile.build

    r39e8406 rb535aeb  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    35 include ../../../../config.defs
    3636include Makefile.common
    3737include Makefile.toolchain
  • boot/arch/sparc64/loader/Makefile.toolchain

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_NAME = elf64-sparc
    3730BFD_ARCH = sparc
    38 TARGET = sparc64-linux-gnu
    39 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    4031
    4132JOBFILE = ../../../../tools/jobfile.py
    42 
    43 ifeq ($(COMPILER),gcc_native)
    44         CC = gcc
    45         AS = as
    46         LD = ld
    47         OBJCOPY = objcopy
    48         OBJDUMP = objdump
    49 endif
    50 
    51 ifeq ($(COMPILER),gcc_cross)
    52         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    53         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    54         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    55         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    56         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    57 endif
    5833
    5934CFLAGS = \
  • kernel/Makefile

    r39e8406 rb535aeb  
    2727#
    2828
    29 include Makefile.common
     29## Configuration
     30#
     31
     32ROOT_PATH = ..
     33
     34VERSION_DEF = $(ROOT_PATH)/version
     35
     36COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     37COMMON_HEADER = $(ROOT_PATH)/common.h
     38COMMON_HEADER_ARCH = arch/$(KARCH)/include/common.h
     39
     40CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     41CONFIG_HEADER = $(ROOT_PATH)/config.h
     42
     43-include $(VERSION_DEF)
     44-include $(COMMON_MAKEFILE)
     45-include $(CONFIG_MAKEFILE)
     46
     47## Common names
     48#
     49
     50DEPEND = Makefile.depend
     51DEPEND_PREV = $(DEPEND).prev
     52RAW = kernel.raw
     53BIN = kernel.bin
     54MAP = kernel.map
     55JOB = kernel.job
     56MAP_PREV = $(MAP).prev
     57DISASM = kernel.disasm
     58DUMP = kernel.dump
     59REAL_MAP = generic/src/debug/real_map
     60
     61ARCH_INCLUDE = generic/include/arch
     62GENARCH_INCLUDE = generic/include/genarch
     63
     64GENMAP = tools/genmap.py
     65JOBFILE = $(ROOT_PATH)/tools/jobfile.py
     66
     67LINK = arch/$(KARCH)/_link.ld
     68EMPTY_MAP = generic/src/debug/empty_map.o
     69SIZEOK_MAP = generic/src/debug/sizeok_map.o
     70
     71INCLUDES = generic/include
     72OPTIMIZATION = 3
    3073
    3174.PHONY: all clean
    3275
    33 all: ../version ../Makefile.config ../config.h ../config.defs
    34         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    35         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
     76all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BIN) $(DISASM)
     77        -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
    3678
    3779clean:
    38         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld
     80        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
    3981        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
     82
     83## Common compiler flags
     84#
     85
     86DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
     87
     88GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     89        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
     90        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
     91        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
     92        -Werror-implicit-function-declaration -Wwrite-strings \
     93        -Werror -pipe
     94
     95ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     96        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
     97        -Werror-implicit-function-declaration -Werror -wd170
     98
     99SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
     100        -xnolib -xc99=all -features=extensions \
     101        -erroff=E_ZERO_SIZED_STRUCT_UNION
     102
     103CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     104        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
     105        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
     106        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
     107        -Werror-implicit-function-declaration -Wwrite-strings \
     108        -pipe -arch $(CLANG_ARCH)
     109
     110LFLAGS = -M
     111AFLAGS =
     112
     113-include arch/$(KARCH)/Makefile.inc
     114-include genarch/Makefile.inc
     115-include $(DEPEND)
     116
     117## The at-sign
     118#
     119# The $(ATSIGN) variable holds the ASCII character representing the at-sign
     120# ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
     121# don't use '@' for starting a comment, $(ATSIGN) is merely '@'. However, on
     122# those that do use it for starting a comment (e.g. arm32), $(ATSIGN) must be
     123# defined as the percentile-sign ('%') in the architecture-dependent
     124# Makefile.inc.
     125#
     126
     127ATSIGN ?= @
     128
     129## Cross-platform assembly to start a symtab.data section
     130#
     131
     132SYMTAB_SECTION = ".section symtab.data, \"a\", $(ATSIGN)progbits;"
     133
     134## Compilation options
     135#
     136
     137ifeq ($(COMPILER),gcc_native)
     138        CFLAGS = $(GCC_CFLAGS)
     139        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     140endif
     141
     142ifeq ($(COMPILER),gcc_cross)
     143        CFLAGS = $(GCC_CFLAGS)
     144        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     145endif
     146
     147ifeq ($(COMPILER),icc)
     148        CFLAGS = $(ICC_CFLAGS)
     149        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     150endif
     151
     152ifeq ($(COMPILER),suncc)
     153        CFLAGS = $(SUNCC_CFLAGS)
     154        DEFS += $(CONFIG_DEFS)
     155        DEPEND_DEFS = $(DEFS)
     156endif
     157
     158ifeq ($(COMPILER),clang)
     159        CFLAGS = $(CLANG_CFLAGS)
     160        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     161endif
     162
     163## Generic kernel sources
     164#
     165
     166GENERIC_SOURCES = \
     167        generic/src/adt/avl.c \
     168        generic/src/adt/bitmap.c \
     169        generic/src/adt/btree.c \
     170        generic/src/adt/hash_table.c \
     171        generic/src/adt/list.c \
     172        generic/src/console/chardev.c \
     173        generic/src/console/console.c \
     174        generic/src/cpu/cpu.c \
     175        generic/src/ddi/ddi.c \
     176        generic/src/ddi/irq.c \
     177        generic/src/ddi/device.c \
     178        generic/src/debug/symtab.c \
     179        generic/src/debug/stacktrace.c \
     180        generic/src/interrupt/interrupt.c \
     181        generic/src/main/main.c \
     182        generic/src/main/kinit.c \
     183        generic/src/main/uinit.c \
     184        generic/src/main/version.c \
     185        generic/src/main/shutdown.c \
     186        generic/src/proc/program.c \
     187        generic/src/proc/scheduler.c \
     188        generic/src/proc/thread.c \
     189        generic/src/proc/task.c \
     190        generic/src/proc/the.c \
     191        generic/src/proc/tasklet.c \
     192        generic/src/syscall/syscall.c \
     193        generic/src/syscall/copy.c \
     194        generic/src/mm/buddy.c \
     195        generic/src/mm/frame.c \
     196        generic/src/mm/page.c \
     197        generic/src/mm/tlb.c \
     198        generic/src/mm/as.c \
     199        generic/src/mm/backend_anon.c \
     200        generic/src/mm/backend_elf.c \
     201        generic/src/mm/backend_phys.c \
     202        generic/src/mm/slab.c \
     203        generic/src/lib/func.c \
     204        generic/src/lib/memstr.c \
     205        generic/src/lib/sort.c \
     206        generic/src/lib/string.c \
     207        generic/src/lib/elf.c \
     208        generic/src/lib/rd.c \
     209        generic/src/printf/printf_core.c \
     210        generic/src/printf/printf.c \
     211        generic/src/printf/snprintf.c \
     212        generic/src/printf/vprintf.c \
     213        generic/src/printf/vsnprintf.c \
     214        generic/src/time/clock.c \
     215        generic/src/time/timeout.c \
     216        generic/src/time/delay.c \
     217        generic/src/preempt/preemption.c \
     218        generic/src/synch/spinlock.c \
     219        generic/src/synch/condvar.c \
     220        generic/src/synch/rwlock.c \
     221        generic/src/synch/mutex.c \
     222        generic/src/synch/semaphore.c \
     223        generic/src/synch/smc.c \
     224        generic/src/synch/waitq.c \
     225        generic/src/synch/futex.c \
     226        generic/src/smp/ipi.c \
     227        generic/src/smp/smp.c \
     228        generic/src/ipc/ipc.c \
     229        generic/src/ipc/sysipc.c \
     230        generic/src/ipc/ipcrsc.c \
     231        generic/src/ipc/irq.c \
     232        generic/src/ipc/event.c \
     233        generic/src/security/cap.c \
     234        generic/src/sysinfo/sysinfo.c
     235
     236## Kernel console support
     237#
     238
     239ifeq ($(CONFIG_KCONSOLE),y)
     240GENERIC_SOURCES += \
     241        generic/src/console/kconsole.c \
     242        generic/src/console/cmd.c
     243endif
     244
     245## Udebug interface sources
     246#
     247
     248ifeq ($(CONFIG_UDEBUG),y)
     249GENERIC_SOURCES += \
     250        generic/src/ipc/kbox.c \
     251        generic/src/udebug/udebug.c \
     252        generic/src/udebug/udebug_ops.c \
     253        generic/src/udebug/udebug_ipc.c
     254endif
     255
     256## Test sources
     257#
     258
     259ifeq ($(CONFIG_TEST),y)
     260        CFLAGS += -Itest/
     261        GENERIC_SOURCES += \
     262                test/test.c \
     263                test/atomic/atomic1.c \
     264                test/btree/btree1.c \
     265                test/avltree/avltree1.c \
     266                test/fault/fault1.c \
     267                test/mm/falloc1.c \
     268                test/mm/falloc2.c \
     269                test/mm/mapping1.c \
     270                test/mm/slab1.c \
     271                test/mm/slab2.c \
     272                test/synch/rwlock1.c \
     273                test/synch/rwlock2.c \
     274                test/synch/rwlock3.c \
     275                test/synch/rwlock4.c \
     276                test/synch/rwlock5.c \
     277                test/synch/semaphore1.c \
     278                test/synch/semaphore2.c \
     279                test/print/print1.c \
     280                test/print/print2.c \
     281                test/print/print3.c \
     282                test/print/print4.c \
     283                test/thread/thread1.c \
     284                test/sysinfo/sysinfo1.c
     285       
     286        ifeq ($(KARCH),mips32)
     287                GENERIC_SOURCES += test/debug/mips1.c
     288        else
     289                GENERIC_SOURCES += test/debug/mips1_skip.c
     290        endif
     291       
     292        ifeq ($(KARCH),ia64)
     293                GENERIC_SOURCES += test/mm/purge1.c
     294        else
     295                GENERIC_SOURCES += test/mm/purge1_skip.c
     296        endif
     297       
     298        ifeq ($(CONFIG_FPU),y)
     299                ifeq ($(KARCH),ia32)
     300                        TEST_FPU1 = y
     301                        TEST_SSE1 = y
     302                        GENERIC_SOURCES += test/fpu/fpu1_x86.c
     303                endif
     304               
     305                ifeq ($(KARCH),amd64)
     306                        TEST_FPU1 = y
     307                        TEST_SSE1 = y
     308                        GENERIC_SOURCES += test/fpu/fpu1_x86.c
     309                endif
     310               
     311                ifeq ($(KARCH),ia64)
     312                        TEST_FPU1 = y
     313                        GENERIC_SOURCES += test/fpu/fpu1_ia64.c
     314                endif
     315               
     316                ifeq ($(KARCH),mips32)
     317                        TEST_MIPS2 = y
     318                endif
     319        endif
     320       
     321        ifneq ($(TEST_FPU1),y)
     322                GENERIC_SOURCES += test/fpu/fpu1_skip.c
     323        endif
     324       
     325        ifeq ($(TEST_SSE1),y)
     326                GENERIC_SOURCES += test/fpu/sse1.c
     327        else
     328                GENERIC_SOURCES += test/fpu/sse1_skip.c
     329        endif
     330       
     331        ifeq ($(TEST_MIPS2),y)
     332                GENERIC_SOURCES += test/fpu/mips2.c
     333        else
     334                GENERIC_SOURCES += test/fpu/mips2_skip.c
     335        endif
     336       
     337endif
     338
     339GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
     340ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
     341GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
     342
     343ifeq ($(CONFIG_SYMTAB),y)
     344        SYMTAB_OBJECTS := generic/src/debug/real_map.o
     345else
     346        SYMTAB_OBJECTS :=
     347endif
     348
     349
     350
     351$(BIN): $(RAW)
     352        $(OBJCOPY) -O $(BFD) $< $@
     353
     354$(DISASM): $(RAW)
     355        $(OBJDUMP) -d $< > $@
     356
     357$(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)
     358        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS) -o $@ -Map $(MAP)
     359
     360$(LINK): $(LINK).in $(DEPEND)
     361        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
     362
     363%.o: %.S $(DEPEND)
     364        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
     365ifeq ($(PRECHECK),y)
     366        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(GCC_CFLAGS) -D__ASM__
     367endif
     368
     369%.o: %.s $(DEPEND)
     370        $(AS) $(AFLAGS) $< -o $@
     371ifeq ($(PRECHECK),y)
     372        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     373endif
     374
     375#
     376# The FPU tests are the only objects for which we allow the compiler to generate
     377# FPU instructions.
     378#
     379
     380test/fpu/%.o: test/fpu/%.c $(DEPEND)
     381        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
     382ifeq ($(PRECHECK),y)
     383        $(JOBFILE) $(JOB) $< $@ cc test $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     384endif
     385
     386#
     387# Ordinary objects.
     388#
     389
     390%.o: %.c $(DEPEND)
     391        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@
     392ifeq ($(PRECHECK),y)
     393        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
     394endif
     395
     396$(REAL_MAP).o: $(REAL_MAP).bin
     397        echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@
     398
     399$(REAL_MAP).bin: $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
     400        echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o $(EMPTY_MAP)
     401        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP) -o $@ -Map $(MAP_PREV)
     402        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
     403        $(GENMAP) $(MAP_PREV) $(DUMP) $@
     404       
     405        # Do it once again, this time to get correct even the symbols
     406        # on architectures that have bss after symtab
     407       
     408        echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o $(SIZEOK_MAP)
     409        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP) -o $@ -Map $(MAP_PREV)
     410        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
     411        $(GENMAP) $(MAP_PREV) $(DUMP) $@
     412
     413$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
     414        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
     415        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
     416
     417$(ARCH_INCLUDE): arch/$(KARCH)/include/
     418        ln -sfn ../../$< $@
     419
     420$(GENARCH_INCLUDE): genarch/include/
     421        ln -sfn ../../$< $@
     422
     423$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
     424        ln -sfn ../../../$< $@
  • kernel/arch/abs32le/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD = binary
    3330
    3431ifeq ($(COMPILER),gcc_cross)
    35         TOOLCHAIN_DIR = $(CROSS_PREFIX)/$(CROSS_TARGET)
    36        
    3732        ifeq ($(CROSS_TARGET),arm32)
    38                 TARGET = arm-linux-gnu
    3933                ATSIGN = %
    4034        endif
    4135       
    42         ifeq ($(CROSS_TARGET),ia32)
    43                 TARGET = i686-pc-linux-gnu
    44         endif
    45        
    4636        ifeq ($(CROSS_TARGET),mips32)
    47                 TARGET = mipsel-linux-gnu
    4837                GCC_CFLAGS += -mno-abicalls
    4938        endif
  • kernel/arch/amd64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf64-x86-64
    3330BFD_ARCH = i386:x86-64
    3431BFD = binary
    35 TARGET = amd64-linux-gnu
    3632CLANG_ARCH = x86_64
    37 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64
    3833
    3934FPU_NO_CFLAGS = -mno-sse -mno-sse2
  • kernel/arch/arm32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf32-littlearm
    3330BFD_ARCH = arm
    3431BFD = binary
    35 TARGET = arm-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32
    3732
    3833ATSIGN = %
  • kernel/arch/arm32/src/dummy.S

    r39e8406 rb535aeb  
    11#
    2 # Copyright (c) 2007 Michal Kebry, Pavel Jancik, Petr Stepan
     2# Copyright (c) 2007 Michal Kebrt, Pavel Jancik, Petr Stepan
    33# All rights reserved.
    44#
  • kernel/arch/ia32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf32-i386
    3330BFD_ARCH = i386
    3431BFD = binary
    35 TARGET = i686-pc-linux-gnu
    3632CLANG_ARCH = i386
    37 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32
    3833
    3934BITS = 32
     
    5348        SUNCC_CFLAGS += -xarch=ssea
    5449endif
     50
    5551ifeq ($(PROCESSOR),athlon_mp)
    5652        CMN2 = -march=athlon-mp
    5753        SUNCC_CFLAGS += xarch=ssea
    5854endif
     55
    5956ifeq ($(PROCESSOR),pentium3)
    6057        CMN2 = -march=pentium3
    6158        SUNCC_CFLAGS += -xarch=sse
    6259endif
     60
    6361ifeq ($(PROCESSOR),pentium4)
    6462        CMN2 = -march=pentium4
    6563        SUNCC_CFLAGS += -xarch=sse2
    6664endif
     65
    6766ifeq ($(PROCESSOR),core)
    6867        CMN2 = -march=prescott
  • kernel/arch/ia32/include/types.h

    r39e8406 rb535aeb  
    2727 */
    2828
    29 /** @addtogroup ia32   
     29/** @addtogroup ia32
    3030 * @{
    3131 */
     
    3636#define KERN_ia32_TYPES_H_
    3737
    38 typedef signed char int8_t;
    39 typedef signed short int16_t;
    40 typedef signed long int32_t;
    41 typedef signed long long int64_t;
    42 
    43 typedef unsigned char uint8_t;
    44 typedef unsigned short uint16_t;
    45 typedef unsigned long uint32_t;
    46 typedef unsigned long long uint64_t;
     38#include <arch/common.h>
    4739
    4840typedef uint32_t size_t;
  • kernel/arch/ia64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf64-little
    3330BFD_ARCH = ia64-elf64
    34 TARGET = ia64-pc-linux-gnu
    35 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64
    3631
    3732CMN1 = -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
  • kernel/arch/mips32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_ARCH = mips
    3330BFD = binary
    34 TARGET = mipsel-linux-gnu
    35 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32
    36 
    3731GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
    3832
     
    4842ifeq ($(MACHINE),bgxemul)
    4943        BFD_NAME = elf32-tradbigmips
    50         TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb
    51         TARGET = mips-linux-gnu
    5244        ENDIANESS = BE
    5345        GCC_CFLAGS += -D__BE__
  • kernel/arch/ppc32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf32-powerpc
    3330BFD_ARCH = powerpc:common
    3431BFD = binary
    35 TARGET = ppc-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32
    3732
    3833GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32
  • kernel/arch/sparc64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf64-sparc
    3330BFD_ARCH = sparc
    3431BFD = binary
    35 TARGET = sparc64-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64
    3732
    3833GCC_CFLAGS += -m64 -mcpu=ultrasparc
  • kernel/tools/genmap.py

    r39e8406 rb535aeb  
    11#!/usr/bin/env python
     2#
     3# Copyright (c) 2006 Ondrej Palkovsky
     4# All rights reserved.
     5#
     6# Redistribution and use in source and binary forms, with or without
     7# modification, are permitted provided that the following conditions
     8# are met:
     9#
     10# - Redistributions of source code must retain the above copyright
     11#   notice, this list of conditions and the following disclaimer.
     12# - Redistributions in binary form must reproduce the above copyright
     13#   notice, this list of conditions and the following disclaimer in the
     14#   documentation and/or other materials provided with the distribution.
     15# - The name of the author may not be used to endorse or promote products
     16#   derived from this software without specific prior written permission.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     19# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     20# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     21# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     22# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     23# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     24# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     25# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     26# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     27# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     28#
     29
     30"""
     31Create binary symbol map out of linker map file
     32"""
    233
    334import sys
     
    536import re
    637
    7 MAXSTRING=63
    8 symtabfmt = "<Q%ds" % (MAXSTRING+1)
    9 
     38MAXSTRING = 63
     39symtabfmt = "<Q%ds" % (MAXSTRING + 1)
    1040
    1141funcline = re.compile(r'([0-9a-f]+)\s+[lg]\s+.\s+\.text\s+([0-9a-f]+)\s+(.*)$')
     
    1343dataline = re.compile(r'([0-9a-f]+)\s+[lg]\s+[a-zA-Z]\s+\.data\s+([0-9a-f]+)\s+(.*)$')
    1444fileexp = re.compile(r'([^\s]+):\s+file format')
     45startfile = re.compile(r'\.(text|bss|data)\s+(0x[0-9a-f]+)\s+0x[0-9a-f]+\s+(.*)$')
     46
    1547def read_obdump(inp):
    16     funcs = {}
    17     data = {}
    18     bss ={}
    19     fname = ''
    20     for line in inp:
    21         line = line.strip()
    22         res = funcline.match(line)
    23         if res:
    24             funcs.setdefault(fname,[]).append((int(res.group(1),16),
    25                                                res.group(3)))
    26             continue
    27         res = bssline.match(line)
    28         if res:
    29             start = int(res.group(1),16)
    30             end = int(res.group(2),16)
    31             if end:
    32                 bss.setdefault(fname,[]).append((start,res.group(3)))
    33         res = dataline.match(line)
    34         if res:
    35             start = int(res.group(1),16)
    36             end = int(res.group(2),16)
    37             if end:
    38                 data.setdefault(fname,[]).append((start,res.group(3)))
    39         res = fileexp.match(line)
    40         if res:
    41             fname = res.group(1)
    42             continue
     48        "Parse input"
     49       
     50        funcs = {}
     51        data = {}
     52        bss = {}
     53        fname = ''
     54       
     55        for line in inp:
     56                line = line.strip()
     57                res = funcline.match(line)
     58                if (res):
     59                        funcs.setdefault(fname, []).append((int(res.group(1), 16), res.group(3)))
     60                        continue
     61               
     62                res = bssline.match(line)
     63                if (res):
     64                        start = int(res.group(1), 16)
     65                        end = int(res.group(2), 16)
     66                        if (end):
     67                                bss.setdefault(fname, []).append((start, res.group(3)))
     68               
     69                res = dataline.match(line)
     70                if (res):
     71                        start = int(res.group(1), 16)
     72                        end = int(res.group(2), 16)
     73                        if (end):
     74                                data.setdefault(fname, []).append((start, res.group(3)))
     75               
     76                res = fileexp.match(line)
     77                if (res):
     78                        fname = res.group(1)
     79                        continue
     80       
     81        return {'text' : funcs, 'bss' : bss, 'data' : data}
    4382
    44     return {
    45         'text' : funcs,
    46         'bss' : bss,
    47         'data' : data
    48         }
    49 
    50 startfile = re.compile(r'\.(text|bss|data)\s+(0x[0-9a-f]+)\s+0x[0-9a-f]+\s+(.*)$')
    5183def generate(kmapf, obmapf, out):
    52     obdump = read_obdump(obmapf)   
    53 
    54     def sorter(x,y):
    55         return cmp(x[0],y[0])
    56 
    57     for line in kmapf:
    58         line = line.strip()
    59         res = startfile.match(line)
    60 
    61         if res and obdump[res.group(1)].has_key(res.group(3)):
    62             offset = int(res.group(2),16)
    63             fname = res.group(3)
    64             symbols = obdump[res.group(1)][fname]
    65             symbols.sort(sorter)
    66             for addr,symbol in symbols:               
    67                 value = fname + ':' + symbol
    68                 data = struct.pack(symtabfmt,addr+offset,value[:MAXSTRING])
    69                 out.write(data)
    70                
    71     out.write(struct.pack(symtabfmt,0,''))
     84        "Generate output file"
     85       
     86        obdump = read_obdump(obmapf)
     87       
     88        def sorter(x,y):
     89                return cmp(x[0],y[0])
     90       
     91        for line in kmapf:
     92                line = line.strip()
     93                res = startfile.match(line)
     94               
     95                if ((res) and (obdump[res.group(1)].has_key(res.group(3)))):
     96                        offset = int(res.group(2), 16)
     97                        fname = res.group(3)
     98                        symbols = obdump[res.group(1)][fname]
     99                        symbols.sort(sorter)
     100                        for addr, symbol in symbols:
     101                                value = fname + ':' + symbol
     102                                data = struct.pack(symtabfmt, addr + offset, value[:MAXSTRING])
     103                                out.write(data)
     104                       
     105        out.write(struct.pack(symtabfmt, 0, ''))
    72106
    73107def main():
    74     if len(sys.argv) != 4:
    75         print "Usage: %s <kernel.map> <nm dump> <output.bin>" % sys.argv[0]
    76         sys.exit(1)
    77 
    78     kmapf = open(sys.argv[1],'r')
    79     obmapf = open(sys.argv[2],'r')
    80     out = open(sys.argv[3],'w')
    81     generate(kmapf,obmapf,out)
    82     kmapf.close()
    83     obmapf.close()
    84     out.close()
     108        if (len(sys.argv) != 4):
     109                print "Usage: %s <kernel.map> <nm dump> <output.bin>" % sys.argv[0]
     110                return 1
     111       
     112        kmapf = open(sys.argv[1], 'r')
     113        obmapf = open(sys.argv[2], 'r')
     114        out = open(sys.argv[3], 'w')
     115       
     116        generate(kmapf, obmapf, out)
     117       
     118        kmapf.close()
     119        obmapf.close()
     120        out.close()
    85121
    86122if __name__ == '__main__':
    87     main()
     123        sys.exit(main())
  • tools/config.py

    r39e8406 rb535aeb  
    2828# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929#
     30
    3031"""
    3132HelenOS configuration system
    3233"""
     34
    3335import sys
    3436import os
     
    4143MAKEFILE = 'Makefile.config'
    4244MACROS = 'config.h'
    43 DEFS = 'config.defs'
    4445PRECONF = 'defaults'
    4546
     
    223224        return True
    224225
    225 def create_output(mkname, mcname, dfname, defaults, ask_names):
     226def create_output(mkname, mcname, defaults, ask_names):
    226227        "Create output configuration"
    227228       
     
    229230       
    230231        sys.stderr.write("Fetching current revision identifier ... ")
    231         version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
    232         sys.stderr.write("OK\n")
     232       
     233        try:
     234                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
     235                sys.stderr.write("ok\n")
     236        except:
     237                version = [1, "unknown", "unknown"]
     238                sys.stderr.write("failed\n")
    233239       
    234240        if (len(version) == 3):
     
    242248        outmk = file(mkname, 'w')
    243249        outmc = file(mcname, 'w')
    244         outdf = file(dfname, 'w')
    245250       
    246251        outmk.write('#########################################\n')
     
    252257        outmc.write(' ***************************************/\n\n')
    253258       
    254         outdf.write('#########################################\n')
    255         outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
    256         outdf.write('#########################################\n\n')
    257         outdf.write('CONFIG_DEFS =')
     259        defs = 'CONFIG_DEFS ='
    258260       
    259261        for varname, vartype, name, choices, cond in ask_names:
     
    273275                        if (default == "y"):
    274276                                outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
    275                                 outdf.write(' -D%s' % varname)
     277                                defs += ' -D%s' % varname
    276278                else:
    277279                        outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
    278                         outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
     280                        defs += ' -D%s=%s -D%s_%s' % (varname, default, varname, default)
    279281       
    280282        if (revision is not None):
    281283                outmk.write('REVISION = %s\n' % revision)
    282284                outmc.write('#define REVISION %s\n' % revision)
    283                 outdf.write(' "-DREVISION=%s"' % revision)
     285                defs += ' "-DREVISION=%s"' % revision
    284286       
    285287        outmk.write('TIMESTAMP = %s\n' % timestamp)
    286288        outmc.write('#define TIMESTAMP %s\n' % timestamp)
    287         outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
     289        defs += ' "-DTIMESTAMP=%s"\n' % timestamp
     290       
     291        outmk.write(defs)
    288292       
    289293        outmk.close()
    290294        outmc.close()
    291         outdf.close()
    292295
    293296def sorted_dir(root):
     
    348351        if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
    349352                if (check_choices(defaults, ask_names)):
    350                         create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
     353                        create_output(MAKEFILE, MACROS, defaults, ask_names)
    351354                        return 0
    352355       
     
    466469                xtui.screen_done(screen)
    467470       
    468         create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
     471        create_output(MAKEFILE, MACROS, defaults, ask_names)
    469472        return 0
    470473
  • tools/jobfile.py

    r39e8406 rb535aeb  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
     29
    2930"""
    3031Add a source/object file pair to a checker jobfile
  • tools/mkfat.py

    r39e8406 rb535aeb  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
     29
    2930"""
    3031FAT creator
  • tools/mkhord.py

    r39e8406 rb535aeb  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
     29
    2930"""
    3031HORD encapsulator
  • tools/mktmpfs.py

    r39e8406 rb535aeb  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
     29
    2930"""
    3031TMPFS creator
  • uspace/Makefile

    r39e8406 rb535aeb  
    3030#
    3131
     32-include ../Makefile.common
    3233-include ../Makefile.config
    3334
  • uspace/app/Makefile.common

    r39e8406 rb535aeb  
    6060all: \
    6161    $(LIBC_PREFIX)/../../../version \
     62    $(LIBC_PREFIX)/../../../Makefile.common \
    6263    $(LIBC_PREFIX)/../../../Makefile.config \
    6364    $(LIBC_PREFIX)/../../../config.h \
    64     $(LIBC_PREFIX)/../../../config.defs \
    6565    $(LIBS) \
    6666    \
  • uspace/lib/Makefile.common

    r39e8406 rb535aeb  
    5050OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
    5151
     52-include $(USPACE_PREFIX)/../Makefile.common
    5253-include $(USPACE_PREFIX)/../Makefile.config
    5354include $(LIBC_PREFIX)/Makefile.toolchain
     
    5960all: \
    6061    $(LIBC_PREFIX)/../../../version \
     62    $(LIBC_PREFIX)/../../../Makefile.common \
    6163    $(LIBC_PREFIX)/../../../Makefile.config \
    6264    $(LIBC_PREFIX)/../../../config.h \
    63     $(LIBC_PREFIX)/../../../config.defs \
    6465    $(LIBS) \
    6566    \
  • uspace/lib/libc/Makefile

    r39e8406 rb535aeb  
    2828#
    2929
     30-include ../../../Makefile.common
    3031-include ../../../Makefile.config
    3132
  • uspace/lib/libc/Makefile.toolchain

    r39e8406 rb535aeb  
    5353AFLAGS =
    5454
    55 ## Cross-toolchain prefix
    56 #
    57 
    58 ifndef CROSS_PREFIX
    59         CROSS_PREFIX = /usr/local
    60 endif
    61 
    6255## Setup platform configuration
    6356#
    6457
     58-include $(LIBC_PREFIX)/../../../Makefile.common
    6559-include $(LIBC_PREFIX)/../../../Makefile.config
    66 -include $(LIBC_PREFIX)/../../../config.defs
    6760-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
    6861
    69 ## Simple detection of the host system
    70 #
    71 HOST = $(shell uname)
    72 
    73 ## On Solaris, some utilities have different names
    74 #
    75 ifeq ($(HOST),SunOS)
    76         BINUTILS_PREFIX = "g"
    77 else
    78         BINUTILS_PREFIX = ""
    79 endif
    80 
    81 ## Toolchain configuration
     62## Compilation options
    8263#
    8364
     
    8566
    8667ifeq ($(COMPILER),gcc_cross)
    87         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    88         GCC = $(CC)
    89         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    90         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    91         AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
    92         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    93         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    9468        CFLAGS = $(GCC_CFLAGS)
    9569        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    9771
    9872ifeq ($(COMPILER),gcc_native)
    99         CC = gcc
    100         GCC = $(CC)
    101         AS = $(BINUTILS_PREFIX)as
    102         LD = $(BINUTILS_PREFIX)ld
    103         AR = $(BINUTILS_PREFIX)ar
    104         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    105         OBJDUMP = $(BINUTILS_PREFIX)objdump
    10673        CFLAGS = $(GCC_CFLAGS)
    10774        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    10976
    11077ifeq ($(COMPILER),icc)
    111         CC = icc
    112         GCC = gcc
    113         AS = as
    114         LD = ld
    115         AR = ar
    116         OBJCOPY = objcopy
    117         OBJDUMP = objdump
    11878        CFLAGS = $(ICC_CFLAGS)
    11979        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    12181
    12282ifeq ($(COMPILER),clang)
    123         CC = clang
    124         GCC = gcc
    125         AS = $(BINUTILS_PREFIX)as
    126         LD = $(BINUTILS_PREFIX)ld
    127         AR = $(BINUTILS_PREFIX)ar
    128         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    129         OBJDUMP = $(BINUTILS_PREFIX)objdump
    13083        CFLAGS = $(CLANG_CFLAGS)
    13184        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
  • uspace/lib/libc/arch/abs32le/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifeq ($(COMPILER),gcc_cross)
    33         TOOLCHAIN_DIR = $(CROSS_PREFIX)/$(CROSS_TARGET)/bin
    34        
    35         ifeq ($(CROSS_TARGET),arm32)
    36                 TARGET = arm-linux-gnu
    37         endif
    38        
    39         ifeq ($(CROSS_TARGET),ia32)
    40                 TARGET = i686-pc-linux-gnu
    41         endif
    42        
    43         ifeq ($(CROSS_TARGET),mips32)
    44                 TARGET = mipsel-linux-gnu
    45         endif
    46 endif
    47 
    4829ifeq ($(COMPILER),clang)
    4930        CLANG_ARCH = i386
  • uspace/lib/libc/arch/amd64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = amd64-linux-gnu
    3329CLANG_ARCH = x86_64
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
    3530
    3631ARCH_SOURCES = \
  • uspace/lib/libc/arch/arm32/Makefile.inc

    r39e8406 rb535aeb  
    2828#
    2929
    30 ## Toolchain configuration
    31 #
    32 
    33 TARGET = arm-linux-gnu
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    35 
    3630ARCH_SOURCES = \
    3731        arch/$(UARCH)/src/entry.s \
  • uspace/lib/libc/arch/ia32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = i686-pc-linux-gnu
    3329CLANG_ARCH = i386
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32/bin
    3530
    3631ARCH_SOURCES = \
  • uspace/lib/libc/arch/ia64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = ia64-pc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \
  • uspace/lib/libc/arch/mips32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = mipsel-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \
  • uspace/lib/libc/arch/mips32eb/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = mips-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \
  • uspace/lib/libc/arch/ppc32/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = ppc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \
  • uspace/lib/libc/arch/sparc64/Makefile.inc

    r39e8406 rb535aeb  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = sparc64-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \
  • uspace/srv/Makefile.common

    r39e8406 rb535aeb  
    6464all: \
    6565    $(LIBC_PREFIX)/../../../version \
     66    $(LIBC_PREFIX)/../../../Makefile.common \
    6667    $(LIBC_PREFIX)/../../../Makefile.config \
    6768    $(LIBC_PREFIX)/../../../config.h \
    68     $(LIBC_PREFIX)/../../../config.defs \
    6969    $(LIBS) \
    7070    \
     
    7777        find . -name '*.o' -follow -exec rm \{\} \;
    7878
    79 build: 
     79build:
    8080
    8181-include $(DEPEND)
  • uspace/srv/hid/char_mouse/chardev.c

    r39e8406 rb535aeb  
    4848static int dev_phone;
    4949
    50 #define NAME "kbd"
     50#define NAME "char_mouse"
    5151
    5252int mouse_port_init(void)
  • uspace/srv/hid/char_mouse/proto/ps2.c

    r39e8406 rb535aeb  
    3636
    3737#include <stdio.h>
     38#include <mouse_port.h>
     39#include <char_mouse.h>
    3840#include <mouse_proto.h>
    39 #include <char_mouse.h>
    4041
    4142#define BUFSIZE 3
     43
     44#define PS2_MOUSE_OUT_INIT  0xf4
     45#define PS2_MOUSE_ACK       0xfa
    4246
    4347typedef struct {
     
    6771int mouse_proto_init(void)
    6872{
     73        mouse_port_write(PS2_MOUSE_OUT_INIT);
    6974        return 0;
    7075}
  • uspace/srv/hid/console/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • uspace/srv/hid/fb/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • uspace/srv/hid/kbd/Makefile

    r39e8406 rb535aeb  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
  • uspace/srv/hw/char/i8042/i8042.c

    r39e8406 rb535aeb  
    6868#define i8042_KBD_TRANSLATE     0x40
    6969
    70 /* Mouse constants */
    71 #define MOUSE_OUT_INIT  0xf4
    72 #define MOUSE_ACK       0xfa
    7370
    7471enum {
     
    177174        async_set_interrupt_received(i8042_irq_handler);
    178175
    179         /* Disable kbd, enable mouse */
     176        /* Disable kbd and aux */
     177        wait_ready();
    180178        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
    181179        wait_ready();
    182         pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
    183         wait_ready();
    184         pio_write_8(&i8042->data, i8042_KBD_DISABLE);
    185         wait_ready();
     180        pio_write_8(&i8042->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
    186181
    187182        /* Flush all current IO */
    188183        while (pio_read_8(&i8042->status) & i8042_OUTPUT_FULL)
    189184                (void) pio_read_8(&i8042->data);
    190 
    191         i8042_port_write(DEVID_AUX, MOUSE_OUT_INIT);
    192185
    193186        i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
     
    195188        ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
    196189        ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
    197 
     190        printf("i8042: registered for interrupts %d and %d\n",
     191            sysinfo_value("i8042.inr_a"), sysinfo_value("i8042.inr_b"));
     192
     193        wait_ready();
    198194        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
    199195        wait_ready();
    200196        pio_write_8(&i8042->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
    201197            i8042_AUX_IE);
    202         wait_ready();
    203198
    204199        return 0;
     
    271266{
    272267        if (devid == DEVID_AUX) {
     268                wait_ready();
    273269                pio_write_8(&i8042->status, i8042_CMD_WRITE_AUX);
    274                 wait_ready();
    275         }
     270        }
     271        wait_ready();
    276272        pio_write_8(&i8042->data, data);
    277         wait_ready();
    278273}
    279274
  • uspace/srv/loader/Makefile

    r39e8406 rb535aeb  
    2828#
    2929
     30-include ../../../Makefile.common
    3031-include ../../../Makefile.config
    3132-include arch/$(UARCH)/Makefile.inc
  • uspace/srv/net/Makefile

    r39e8406 rb535aeb  
    2727#
    2828
     29include ../../../Makefile.common
    2930include ../../../Makefile.config
    3031
  • uspace/srv/net/app/echo/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536
  • uspace/srv/net/app/nettest1/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536
  • uspace/srv/net/app/nettest2/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536
  • uspace/srv/net/app/ping/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536
  • uspace/srv/net/il/ip/ip.c

    r39e8406 rb535aeb  
    895895        ip_pseudo_header_ref header;
    896896        size_t headerlen;
     897        device_id_t device_id;
    897898
    898899        *answer_count = 0;
     
    921922                case NET_IP_GET_ROUTE:
    922923                        ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen));
    923                         ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen, IPC_SET_DEVICE(answer), &header, &headerlen));
     924                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
     925                            &device_id, &header, &headerlen));
     926                        *IPC_SET_DEVICE(answer) = device_id;
    924927                        *IP_SET_HEADERLEN(answer) = headerlen;
    925928                        *answer_count = 2;
  • uspace/srv/net/il/ip/ip_messages.h

    r39e8406 rb535aeb  
    8282 *  @param[out] answer The message answer structure.
    8383 */
    84 #define IP_SET_HEADERLEN(answer)        ((size_t *) &IPC_GET_ARG2(*answer))
     84#define IP_SET_HEADERLEN(answer)        (&IPC_GET_ARG2(*answer))
    8585
    8686/** Returns the network mask message parameter.
  • uspace/srv/net/messages.h

    r39e8406 rb535aeb  
    391391 *  @param[out] answer The message answer structure.
    392392 */
    393 #define IPC_SET_DEVICE(answer)  ((device_id_t *) &IPC_GET_ARG1(*answer))
     393#define IPC_SET_DEVICE(answer)  (&IPC_GET_ARG1(*answer))
    394394
    395395/** Sets the minimum address length in the message answer.
    396396 *  @param[out] answer The message answer structure.
    397397 */
    398 #define IPC_SET_ADDR(answer)            ((size_t *) &IPC_GET_ARG1(*answer))
     398#define IPC_SET_ADDR(answer)            (&IPC_GET_ARG1(*answer))
    399399
    400400/*@}*/
     
    407407 *  @param[out] answer The message answer structure.
    408408 */
    409 #define IPC_SET_PREFIX(answer)  ((size_t *) &IPC_GET_ARG2(*answer))
     409#define IPC_SET_PREFIX(answer)  (&IPC_GET_ARG2(*answer))
    410410
    411411/*@}*/
     
    418418 *  @param[out] answer The message answer structure.
    419419 */
    420 #define IPC_SET_CONTENT(answer) ((size_t *) &IPC_GET_ARG3(*answer))
     420#define IPC_SET_CONTENT(answer) (&IPC_GET_ARG3(*answer))
    421421
    422422/*@}*/
     
    429429 *  @param[out] answer The message answer structure.
    430430 */
    431 #define IPC_SET_SUFFIX(answer)  ((size_t *) &IPC_GET_ARG4(*answer))
     431#define IPC_SET_SUFFIX(answer)  (&IPC_GET_ARG4(*answer))
    432432
    433433/*@}*/
  • uspace/srv/net/net/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536
  • uspace/srv/net/net/start/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536
  • uspace/srv/net/netif/dp8390/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536
  • uspace/srv/net/netif/lo/Makefile

    r39e8406 rb535aeb  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536
  • uspace/srv/net/socket/socket_messages.h

    r39e8406 rb535aeb  
    115115 *  @param[out] answer The message answer structure.
    116116 */
    117 #define SOCKET_SET_SOCKET_ID(answer)                    (int *) &IPC_GET_ARG1(answer)
     117#define SOCKET_SET_SOCKET_ID(answer)            &IPC_GET_ARG1(answer)
    118118
    119119/** Returns the socket identifier message parameter.
    120120 *  @param[in] call The message call structure.
    121121 */
    122 #define SOCKET_GET_SOCKET_ID(call)                      (int) IPC_GET_ARG1(call)
     122#define SOCKET_GET_SOCKET_ID(call)              (int) IPC_GET_ARG1(call)
    123123
    124124/** Sets the read data length in the message answer.
    125125 *  @param[out] answer The message answer structure.
    126126 */
    127 #define SOCKET_SET_READ_DATA_LENGTH(answer)     (int *) &IPC_GET_ARG1(answer)
     127#define SOCKET_SET_READ_DATA_LENGTH(answer)     &IPC_GET_ARG1(answer)
    128128
    129129/** Returns the read data length message parameter.
    130130 *  @param[in] call The message call structure.
    131131 */
    132 #define SOCKET_GET_READ_DATA_LENGTH(call)               (int) IPC_GET_ARG1(call)
     132#define SOCKET_GET_READ_DATA_LENGTH(call)       (int) IPC_GET_ARG1(call)
    133133
    134134/** Returns the backlog message parameter.
    135135 *  @param[in] call The message call structure.
    136136 */
    137 #define SOCKET_GET_BACKLOG(call)                                (int) IPC_GET_ARG2(call)
     137#define SOCKET_GET_BACKLOG(call)                (int) IPC_GET_ARG2(call)
    138138
    139139/** Returns the option level message parameter.
    140140 *  @param[in] call The message call structure.
    141141 */
    142 #define SOCKET_GET_OPT_LEVEL(call)                      (int) IPC_GET_ARG2(call)
     142#define SOCKET_GET_OPT_LEVEL(call)              (int) IPC_GET_ARG2(call)
    143143
    144144/** Returns the data fragment size message parameter.
     
    150150 *  @param[out] answer The message answer structure.
    151151 */
    152 #define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   (size_t *) &IPC_GET_ARG2(answer)
     152#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   &IPC_GET_ARG2(answer)
    153153
    154154/** Sets the address length in the message answer.
    155155 *  @param[out] answer The message answer structure.
    156156 */
    157 #define SOCKET_SET_ADDRESS_LENGTH(answer)               (socklen_t *) &IPC_GET_ARG3(answer)
     157#define SOCKET_SET_ADDRESS_LENGTH(answer)       &IPC_GET_ARG3(answer)
    158158
    159159/** Returns the address length message parameter.
     
    165165 *  @param[out] answer The message answer structure.
    166166 */
    167 #define SOCKET_SET_HEADER_SIZE(answer)          (int *) &IPC_GET_ARG3(answer)
     167#define SOCKET_SET_HEADER_SIZE(answer)          &IPC_GET_ARG3(answer)
    168168
    169169/** Returns the header size message parameter.
    170170 *  @param[in] call The message call structure.
    171171 */
    172 #define SOCKET_GET_HEADER_SIZE(call)                    (int) IPC_GET_ARG3(call)
     172#define SOCKET_GET_HEADER_SIZE(call)            (size_t) IPC_GET_ARG3(call)
    173173
    174174/** Returns the flags message parameter.
    175175 *  @param[in] call The message call structure.
    176176 */
    177 #define SOCKET_GET_FLAGS(call)                          (int) IPC_GET_ARG4(call)
     177#define SOCKET_GET_FLAGS(call)                  (int) IPC_GET_ARG4(call)
    178178
    179179/** Returns the option name message parameter.
    180180 *  @param[in] call The message call structure.
    181181 */
    182 #define SOCKET_GET_OPT_NAME(call)                               (int) IPC_GET_ARG4(call)
     182#define SOCKET_GET_OPT_NAME(call)               (int) IPC_GET_ARG4(call)
    183183
    184184/** Returns the data fragments message parameter.
  • uspace/srv/net/tl/tcp/tcp.c

    r39e8406 rb535aeb  
    10601060        int app_phone = IPC_GET_PHONE(&call);
    10611061        struct sockaddr * addr;
     1062        int socket_id;
    10621063        size_t addrlen;
    10631064        fibril_rwlock_t lock;
     
    11041105                                        socket_data->local_sockets = &local_sockets;
    11051106                                        fibril_rwlock_write_lock(&lock);
    1106                                         *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
    1107                                         res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer));
     1107                                        socket_id = SOCKET_GET_SOCKET_ID(call);
     1108                                        res = socket_create(&local_sockets, app_phone, socket_data, &socket_id);
     1109                                        *SOCKET_SET_SOCKET_ID(answer) = socket_id;
    11081110                                        fibril_rwlock_write_unlock(&lock);
    11091111                                        if(res == EOK){
  • uspace/srv/net/tl/udp/udp.c

    r39e8406 rb535aeb  
    417417        int app_phone = IPC_GET_PHONE(&call);
    418418        struct sockaddr * addr;
     419        int socket_id;
    419420        size_t addrlen;
    420421        ipc_call_t answer;
     
    451452                                break;
    452453                        case NET_SOCKET:
    453                                 *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
    454                                 res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer));
     454                                socket_id = SOCKET_GET_SOCKET_ID(call);
     455                                res = socket_create(&local_sockets, app_phone, NULL, &socket_id);
     456                                *SOCKET_SET_SOCKET_ID(answer) = socket_id;
     457                               
    455458                                if(res == EOK){
    456459                                        if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
Note: See TracChangeset for help on using the changeset viewer.