From e599318e912d8836c59d8b5202e3e31a6b8dcae9 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 9 Oct 2013 22:52:54 +0200 Subject: Update files to match FreeBSD layout Add compatibility with Newlib header files. Some FreeBSD header files are mapped by the translation script: o rtems/bsd/sys/_types.h o rtems/bsd/sys/errno.h o rtems/bsd/sys/lock.h o rtems/bsd/sys/param.h o rtems/bsd/sys/resource.h o rtems/bsd/sys/time.h o rtems/bsd/sys/timespec.h o rtems/bsd/sys/types.h o rtems/bsd/sys/unistd.h It is now possible to include directly for example. Generate one Makefile which builds everything including tests. --- freebsd-to-rtems.py | 2967 +++++++++++++++++++++++++++------------------------ 1 file changed, 1552 insertions(+), 1415 deletions(-) (limited to 'freebsd-to-rtems.py') diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index b33703d5..6d4668d1 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -1,9 +1,9 @@ -#! /usr/bin/python +#!/usr/bin/python # -# Copyright (c) 2009-2012 embedded brains GmbH. All rights reserved. +# Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. # # embedded brains GmbH -# Obere Lagerstr. 30 +# Dornierstr. 4 # 82178 Puchheim # Germany # @@ -52,40 +52,6 @@ isOnlyMakefile = False tempFile = "/tmp/tmp_FBRT" filesProcessed = 0 -# currently these all use the MIPS in_cksum method -CPUsNeedingGenericIncksum = [ - "avr", - "bfin", - "h8300", - "lm32", - "m32c", - "m32r", - "m68k", - "nios2", - "sh", - "sparc", - "v850", -] - -# currently these all use the MIPS in_cksum method -CPUsSharingPCICodeFromX86 = [ - 'arm', - 'avr', - 'bfin', - 'h8300', - 'lm32', - 'm32c', - 'm32r', - 'm68k', - 'mips', - 'nios2', - 'powerpc', - 'sh', - 'sparc', - 'sparc64', - 'v850', -] - def usage(): print "freebsd-to-rtems.py [args]" print " -?|-h|--help print this and exit" @@ -180,20 +146,10 @@ else: if isEarlyExit == True: print "Early exit at user request" sys.exit(0) - -# Prefix added to FreeBSD files as they are copied into the RTEMS -# build tree. -PREFIX = 'freebsd' - -def mapContribPath(path): - m = re.match('(.*)(' + PREFIX + '/)(contrib/\\w+/)(.*)', path) - if m: - path = m.group(1) + m.group(3) + m.group(2) + m.group(4) - return path # Move target dependent files under a machine directory def mapCPUDependentPath(path): - return path.replace("include/", "include/freebsd/machine/") + return path.replace("include/", "include/machine/") # compare and process file only if different # + copy or diff depending on execution mode @@ -216,20 +172,31 @@ def processIfDifferent(new, old, src): old_contents, new_contents, fromfile=src, tofile=new, n=5): sys.stdout.write(line) -# fix include paths inside a C or .h file def fixIncludes(data): - data = re.sub('#([ \t]*)include <', '#\\1include <' + PREFIX + '/', data) - data = re.sub('#include <' + PREFIX + '/rtems', '#include ', data) - data = re.sub('_H_', '_HH_', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) + data = re.sub('#include ', '#include ', data) return data # revert fixing the include paths inside a C or .h file def revertFixIncludes(data): - data = re.sub('_HH_', '_H_', data) - data = re.sub('#include <' + PREFIX + '/local/([^>]*)>', '#include "\\1"', data) - data = re.sub('#([ \t]*)include <' + PREFIX + '/', '#\\1include <', data) + data = re.sub('#include ', data) + return data + +# revert fixing the include paths inside a C or .h file +def revertFixLocalIncludes(data): + data = re.sub('#include ]*)>', '#include "\\1"', data) return data class Converter(object): @@ -253,24 +220,42 @@ class EmptyConverter(Converter): class FromFreeBSDToRTEMSHeaderConverter(Converter): def convert(self, src): data = super(FromFreeBSDToRTEMSHeaderConverter, self).convert(src) - return fixIncludes(data) + data = fixLocalIncludes(data) + data = fixIncludes(data) + return data -class FromRTEMSToFreeBSDHeaderConverter(Converter): +class FromFreeBSDToRTEMSUserSpaceHeaderConverter(Converter): def convert(self, src): - data = super(FromRTEMSToFreeBSDHeaderConverter, self).convert(src) - return revertFixIncludes(data) + data = super(FromFreeBSDToRTEMSUserSpaceHeaderConverter, self).convert(src) + data = fixIncludes(data) + return data class FromFreeBSDToRTEMSSourceConverter(Converter): def convert(self, src): data = super(FromFreeBSDToRTEMSSourceConverter, self).convert(src) + data = fixLocalIncludes(data) + data = fixIncludes(data) + data = '#include \n\n' + data + return data + +class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter): + def convert(self, src): + data = super(FromFreeBSDToRTEMSUserSpaceSourceConverter, self).convert(src) data = fixIncludes(data) - data = '#include <' + PREFIX + '/machine/rtems-bsd-config.h>\n\n' + data + return data + +class FromRTEMSToFreeBSDHeaderConverter(Converter): + def convert(self, src): + data = super(FromRTEMSToFreeBSDHeaderConverter, self).convert(src) + data = revertFixLocalIncludes(data) + data = revertFixIncludes(data) return data class FromRTEMSToFreeBSDSourceConverter(Converter): def convert(self, src): data = super(FromRTEMSToFreeBSDSourceConverter, self).convert(src) - data = re.sub('#include <' + PREFIX + '/machine/rtems-bsd-config.h>\n\n', '', data) + data = re.sub('#include \n\n', '', data) + data = revertFixLocalIncludes(data) data = revertFixIncludes(data) return data @@ -279,11 +264,9 @@ class PathComposer(object): return FreeBSD_DIR + '/' + path def composeRTEMSPath(self, path, prefix): - path = prefix + PREFIX + '/' + path - path = mapContribPath(path) - return path + return prefix + 'freebsd/' + path -class RTEMSPathComposer(object): +class RTEMSPathComposer(PathComposer): def composeFreeBSDPath(self, path): return path @@ -297,12 +280,58 @@ class CPUDependentPathComposer(PathComposer): path = mapCPUDependentPath(path) return path +class TargetSourceCPUDependentPathComposer(CPUDependentPathComposer): + def __init__(self, targetCPU, sourceCPU): + self.targetCPU = targetCPU + self.sourceCPU = sourceCPU + + def composeRTEMSPath(self, path, prefix): + path = super(TargetSourceCPUDependentPathComposer, self).composeRTEMSPath(path, prefix) + path = path.replace(self.sourceCPU, self.targetCPU) + return path + +class MakefileFragmentComposer(object): + def compose(self, path): + return '' + +class SourceFileMakefileFragmentComposer(MakefileFragmentComposer): + def compose(self, path): + return 'LIB_C_FILES += ' + path + '\n' + +class TestMakefileFragementComposer(MakefileFragmentComposer): + def __init__(self, testName, fileFragments, runTest): + self.testName = testName + self.fileFragments = fileFragments + self.runTest = runTest + + def compose(self, path): + testPrefix = 'TEST_' + self.testName.upper() + testOFiles = testPrefix + '_O_FILES' + testDFiles = testPrefix + '_D_FILES' + testDir = 'testsuite/' + self.testName + testExe = testDir + '/' + self.testName + '.exe' + makefileFragment = '\n' + testPrefix + ' = ' + testExe + '\n' \ + + testOFiles + ' =\n' \ + + testDFiles + ' =\n' + for fileFragment in self.fileFragments: + makefileFragment = makefileFragment + testOFiles + ' += ' + testDir + '/' + fileFragment + '.o\n' \ + + testDFiles + ' += ' + testDir + '/' + fileFragment + '.d\n' + makefileFragment = makefileFragment + '$(' + testPrefix + '): $(' + testOFiles + ') $(LIB)\n' \ + '\t$(LINK.c) $^ -lm -o $@\n' \ + 'TESTS += $(' + testPrefix + ')\n' \ + 'O_FILES += $(' + testOFiles + ')\n' \ + 'D_FILES += $(' + testDFiles + ')\n' + if self.runTest: + makefileFragment = makefileFragment + 'RUN_TESTS += $(' + testPrefix + ')\n' + return makefileFragment + class File(object): - def __init__(self, path, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter): + def __init__(self, path, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter, makefileFragmentComposer): self.path = path self.pathComposer = pathComposer self.fromFreeBSDToRTEMSConverter = fromFreeBSDToRTEMSConverter self.fromRTEMSToFreeBSDConverter = fromRTEMSToFreeBSDConverter + self.makefileFragmentComposer = makefileFragmentComposer def copy(self, dst, src, converter): if converter.isConvertible(): @@ -329,21 +358,7 @@ class File(object): self.copy(dst, src, self.fromRTEMSToFreeBSDConverter) def getMakefileFragment(self): - return self.pathComposer.composeRTEMSPath(self.path, '') - -# Remove the output directory -def deleteOutputDirectory(): - try: - if isVerbose == True: - print "Delete Directory - " + RTEMS_DIR + "/freebsd" - if isVerbose == True: - print "Delete Directory - " + RTEMS_DIR + "/contrib" - if isDryRun == True: - return - shutil.rmtree(RTEMS_DIR + "/freebsd" ) - shutil.rmtree(RTEMS_DIR + "/contrib" ) - except OSError: - pass + return self.makefileFragmentComposer.compose(self.pathComposer.composeRTEMSPath(self.path, '')) # Module Manager - Collection of Modules class ModuleManager: @@ -369,34 +384,51 @@ class ModuleManager: 'include $(RTEMS_CUSTOM)\n' \ 'include $(PROJECT_ROOT)/make/leaf.cfg\n' \ '\n' \ - 'CFLAGS += -ffreestanding \n' \ - 'CFLAGS += -I . \n' \ - 'CFLAGS += -I rtemsbsd \n' \ - 'CFLAGS += -I rtemsbsd/$(RTEMS_CPU)/include \n' \ - 'CFLAGS += -I freebsd/$(RTEMS_CPU)/include \n' \ - 'CFLAGS += -I contrib/altq \n' \ - 'CFLAGS += -I contrib/pf \n' \ - 'CFLAGS += -I copied/rtemsbsd/$(RTEMS_CPU)/include \n' \ - 'CFLAGS += -w \n' \ + 'CFLAGS += -ffreestanding\n' \ + 'CFLAGS += -Irtemsbsd/include\n' \ + 'CFLAGS += -Irtemsbsd/$(RTEMS_CPU)/include\n' \ + 'CFLAGS += -Ifreebsd/sys\n' \ + 'CFLAGS += -Ifreebsd/sys/$(RTEMS_CPU)/include\n' \ + 'CFLAGS += -Ifreebsd/sys/contrib/altq\n' \ + 'CFLAGS += -Ifreebsd/sys/contrib/pf\n' \ + 'CFLAGS += -Icopied/rtemsbsd/$(RTEMS_CPU)/include\n' \ + 'CFLAGS += -Ifreebsd/include\n' \ + 'CFLAGS += -Ifreebsd/lib/libc/include\n' \ + 'CFLAGS += -Ifreebsd/lib/libc/isc/include\n' \ + 'CFLAGS += -Ifreebsd/lib/libc/resolv\n' \ + 'CFLAGS += -Ifreebsd/lib/libutil\n' \ + 'CFLAGS += -Ifreebsd/lib/libkvm\n' \ + 'CFLAGS += -Ifreebsd/lib/libmemstat\n' \ + 'CFLAGS += -Ifreebsd/lib/libipsec\n' \ + 'CFLAGS += -Itestsuite/include\n' \ + 'CFLAGS += -D__FreeBSD__\n' \ + 'CFLAGS += -D__DBINTERFACE_PRIVATE\n' \ + 'CFLAGS += -w\n' \ 'CFLAGS += -std=gnu99\n' \ 'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \ 'NEED_DUMMY_PIC_IRQ=yes\n' \ '\n' \ '# do nothing default so sed on rtems-bsd-config.h always works.\n' \ 'SED_PATTERN += -e \'s/^//\'\n' \ - 'GENERATED_FILES = rtemsbsd/freebsd/machine/rtems-bsd-config.h\n' \ - '\n' - data += 'C_FILES =\n' + '\n' \ + 'TESTS =\n' \ + 'RUN_TESTS =\n' \ + 'O_FILES =\n' \ + 'D_FILES =\n' \ + '\n' \ + 'LIB = libbsd.a\n' \ + 'LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-config.h\n' \ + 'LIB_C_FILES =\n' for m in self.modules: if m.conditionalOn != "none": data += 'ifneq ($(' + m.conditionalOn + '),yes)\n' - for file in m.sourceFiles: - data += 'C_FILES += ' + file.getMakefileFragment() + '\n' + for f in m.files: + data += f.getMakefileFragment() for cpu, files in sorted(m.cpuDependentSourceFiles.items()): data += 'ifeq ($(RTEMS_CPU), ' + cpu + ')\n' - for file in files: - data += 'C_FILES += ' + file.getMakefileFragment() + '\n' + for f in files: + data += f.getMakefileFragment() if cpu in ("arm", "i386", "lm32", "mips", "powerpc", "sparc"): data += 'NEED_DUMMY_PIC_IRQ=no\n' data += 'endif\n' @@ -404,91 +436,34 @@ class ModuleManager: data += 'else\n' data += 'SED_PATTERN += -e \'' + m.cppPattern +'\'\n' data += 'endif # ' + m.conditionalOn +'\n' - for cpu in CPUsNeedingGenericIncksum: - data += 'ifeq ($(RTEMS_CPU), ' + cpu + ')\n' \ - 'GENERATED_FILES += copied/rtemsbsd/' + cpu + '/' + cpu + '/in_cksum.c\n' \ - 'GENERATED_FILES += copied/rtemsbsd/' + cpu + '/include/freebsd/machine/in_cksum.h\n' \ - 'GENERATED_FILES += copied/rtemsbsd/' + cpu + '/' + cpu + '/in_cksum.c\n' \ - 'C_FILES += copied/rtemsbsd/' + cpu + '/' + cpu + '/in_cksum.c\n' \ - 'endif\n' - for cpu in CPUsSharingPCICodeFromX86: - data += 'ifeq ($(RTEMS_CPU), ' + cpu + ')\n' \ - 'GENERATED_FILES += copied/rtemsbsd/' + cpu + '/include/freebsd/machine/legacyvar.h\n' \ - 'GENERATED_FILES += copied/rtemsbsd/' + cpu + '/include/freebsd/machine/pci_cfgreg.h\n' \ - 'GENERATED_FILES += copied/freebsd/' + cpu + '/pci/pci_bus.c\n' \ - 'GENERATED_FILES += copied/freebsd/' + cpu + '/' + cpu + '/legacy.c\n' \ - 'C_FILES += copied/freebsd/' + cpu + '/pci/pci_bus.c\n' \ - 'C_FILES += copied/freebsd/' + cpu + '/' + cpu + '/legacy.c\n' \ - 'endif\n' data += '\n' \ 'ifeq ($(NEED_DUMMY_PIC_IRQ),yes)\n' \ 'CFLAGS += -I rtems-dummy-pic-irq/include\n' \ 'endif\n' \ - 'C_O_FILES = $(C_FILES:%.c=%.o)\n' \ - 'C_D_FILES = $(C_FILES:%.c=%.d)\n' \ + 'LIB_O_FILES = $(LIB_C_FILES:%.c=%.o)\n' \ + 'O_FILES += $(LIB_O_FILES)\n' \ + 'D_FILES += $(LIB_C_FILES:%.c=%.d)\n' \ '\n' \ - 'LIB = libbsd.a\n' \ - '\n' \ - 'all: $(LIB) lib_user\n' \ + 'all: $(LIB) $(TESTS)\n' \ '\n' \ - '$(LIB): $(GENERATED_FILES) $(C_O_FILES)\n' \ + '$(LIB): $(LIB_GEN_FILES) $(LIB_O_FILES)\n' \ '\t$(AR) rcu $@ $^\n' \ + 'run_tests: $(RUN_TESTS)\n' \ + '\t$(TEST_RUNNER) $^\n' \ + '\tcheck_endof\n' \ '\n' \ - 'lib_user: $(LIB) install_bsd\n' \ - '\t$(MAKE) -C freebsd-userspace\n' \ + '# The following targets use the MIPS Generic in_cksum routine\n' \ + 'rtemsbsd/include/machine/rtems-bsd-config.h: rtemsbsd/include/machine/rtems-bsd-config.h.in\n' \ + '\tsed $(SED_PATTERN) <$< >$@\n' \ '\n' \ - '# The following targets use the MIPS Generic in_cksum routine\n' - data += 'rtemsbsd/freebsd/machine/rtems-bsd-config.h: rtemsbsd/freebsd/machine/rtems-bsd-config.h.in\n' - data += '\tsed $(SED_PATTERN) <$< >$@\n' - data += '\n' - for cpu in CPUsNeedingGenericIncksum: - dDir = 'copied/rtemsbsd/' + cpu + '/' + cpu + '/' - sDir = 'freebsd/mips/mips/' - data += dDir + 'in_cksum.c: ' + sDir + 'in_cksum.c\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' - dDir = 'copied/rtemsbsd/' + cpu + '/include/freebsd/machine/' - sDir = 'freebsd/mips/include/freebsd/machine/' - data += dDir + 'in_cksum.h: ' + sDir + 'in_cksum.h\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' \ - - for cpu in CPUsSharingPCICodeFromX86: - dDir = 'copied/rtemsbsd/' + cpu + '/include/freebsd/machine/' - sDir = 'freebsd/i386/include/freebsd/machine/' - data += dDir + 'legacyvar.h: ' + sDir + 'legacyvar.h\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' + \ - dDir + 'pci_cfgreg.h: ' + sDir + 'pci_cfgreg.h\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' - dDir = 'copied/freebsd/' + cpu + '/pci/' - sDir = 'freebsd/i386/pci/' - data += dDir + 'pci_bus.c: ' + sDir + 'pci_bus.c\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' - dDir = 'copied/freebsd/' + cpu + '/' + cpu + '/' - sDir = 'freebsd/i386/i386/' - data += dDir + 'legacy.c: ' + sDir + 'legacy.c\n' \ - '\ttest -d ' + dDir + ' || mkdir -p ' + dDir + '\n' \ - '\tcp $< $@\n' \ - '\n' - - data += 'CPU_SED = sed\n' \ + 'CPU_SED = sed\n' \ 'CPU_SED += -e \'/arm/d\'\n' \ 'CPU_SED += -e \'/i386/d\'\n' \ 'CPU_SED += -e \'/powerpc/d\'\n' \ 'CPU_SED += -e \'/mips/d\'\n' \ 'CPU_SED += -e \'/sparc64/d\'\n' \ '\n' \ - 'install: $(LIB) install_bsd lib_user install_user\n' \ - '\n' \ - 'install_bsd: $(LIB)\n' \ + 'install: $(LIB)\n' \ '\tinstall -d $(INSTALL_BASE)/include\n' \ '\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \ '\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \ @@ -507,17 +482,11 @@ class ModuleManager: '\t-cd copied/rtemsbsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \ '\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\n' \ - 'install_user:\n' \ - '\t$(MAKE) -C freebsd-userspace install\n' \ - '\n' \ 'clean:\n' \ - '\trm -f -r $(PROJECT_INCLUDE)/rtems/freebsd\n' \ - '\trm -f $(LIB) $(C_O_FILES) $(C_D_FILES) $(GENERATED_FILES)\n' \ + '\trm -f $(LIB_GEN_FILES) $(LIB) $(TESTS) $(O_FILES) $(D_FILES)\n' \ '\trm -f libbsd.html\n' \ - '\trm -rf copied\n' \ - '\t$(MAKE) -C freebsd-userspace clean\n' \ '\n' \ - '-include $(C_D_FILES)\n' \ + '-include $(D_FILES)\n' \ '\n' \ 'doc: libbsd.html\n' \ '\n' \ @@ -548,57 +517,73 @@ class Module: self.name = name self.conditionalOn = "none" self.cppPattern = "s///" - self.headerFiles = [] - self.sourceFiles = [] + self.files = [] self.cpuDependentSourceFiles = {} self.dependencies = [] + def initCPUDependencies(self, cpu): + if not self.cpuDependentSourceFiles.has_key(cpu): + self.cpuDependentSourceFiles [cpu] = [] + def copyFromFreeBSDToRTEMS(self): - for file in self.headerFiles: - file.copyFromFreeBSDToRTEMS() - for file in self.sourceFiles: - file.copyFromFreeBSDToRTEMS() + for f in self.files: + f.copyFromFreeBSDToRTEMS() for cpu, files in self.cpuDependentSourceFiles.items(): - for file in files: - file.copyFromFreeBSDToRTEMS() + for f in files: + f.copyFromFreeBSDToRTEMS() def copyFromRTEMSToFreeBSD(self): - for file in self.headerFiles: - file.copyFromRTEMSToFreeBSD() - for file in self.sourceFiles: - file.copyFromRTEMSToFreeBSD() + for f in self.files: + f.copyFromRTEMSToFreeBSD() for cpu, files in self.cpuDependentSourceFiles.items(): - for file in files: - file.copyFromRTEMSToFreeBSD() + for f in files: + f.copyFromRTEMSToFreeBSD() - def addFiles(self, currentFiles, newFiles, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter, assertFile): - for file in newFiles: - assertFile(file) - currentFiles.append(File(file, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter)) + def addFiles(self, currentFiles, newFiles, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter, assertFile, makefileFragmentComposer = MakefileFragmentComposer()): + for newFile in newFiles: + assertFile(newFile) + currentFiles.append(File(newFile, pathComposer, fromFreeBSDToRTEMSConverter, fromRTEMSToFreeBSDConverter, makefileFragmentComposer)) return currentFiles + def addFile(self, f): + self.files.append(f) + def addHeaderFiles(self, files): - self.headerFiles = self.addFiles(self.headerFiles, files, PathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) + self.files = self.addFiles(self.files, files, PathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) - def addEmptyHeaderFiles(self, files): - self.headerFiles = self.addFiles(self.headerFiles, files, PathComposer(), EmptyConverter(), NoConverter(), assertHeaderFile) + def addUserSpaceHeaderFiles(self, files): + self.files = self.addFiles(self.files, files, PathComposer(), FromFreeBSDToRTEMSUserSpaceHeaderConverter(), FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) def addRTEMSHeaderFiles(self, files): - self.headerFiles = self.addFiles(self.headerFiles, files, RTEMSPathComposer(), NoConverter(), NoConverter(), assertHeaderFile) + self.files = self.addFiles(self.files, files, RTEMSPathComposer(), NoConverter(), NoConverter(), assertHeaderFile) def addCPUDependentHeaderFiles(self, files): - self.headerFiles = self.addFiles(self.headerFiles, files, CPUDependentPathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) + self.files = self.addFiles(self.files, files, CPUDependentPathComposer(), FromFreeBSDToRTEMSHeaderConverter(), FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile) + + def addTargetSourceCPUDependentHeaderFiles(self, targetCPUs, sourceCPU, files): + for cpu in targetCPUs: + self.files = self.addFiles(self.files, files, TargetSourceCPUDependentPathComposer(cpu, sourceCPU), FromFreeBSDToRTEMSHeaderConverter(), NoConverter(), assertHeaderFile) def addSourceFiles(self, files): - self.sourceFiles = self.addFiles(self.sourceFiles, files, PathComposer(), FromFreeBSDToRTEMSSourceConverter(), FromRTEMSToFreeBSDSourceConverter(), assertSourceFile) + self.files = self.addFiles(self.files, files, PathComposer(), FromFreeBSDToRTEMSSourceConverter(), FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, SourceFileMakefileFragmentComposer()) + + def addUserSpaceSourceFiles(self, files): + self.files = self.addFiles(self.files, files, PathComposer(), FromFreeBSDToRTEMSUserSpaceSourceConverter(), FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, SourceFileMakefileFragmentComposer()) def addRTEMSSourceFiles(self, files): - self.sourceFiles = self.addFiles(self.sourceFiles, files, RTEMSPathComposer(), NoConverter(), NoConverter(), assertSourceFile) + self.files = self.addFiles(self.files, files, RTEMSPathComposer(), NoConverter(), NoConverter(), assertSourceFile, SourceFileMakefileFragmentComposer()) def addCPUDependentSourceFiles(self, cpu, files): - if not self.cpuDependentSourceFiles.has_key(cpu): - self.cpuDependentSourceFiles [cpu] = [] - self.cpuDependentSourceFiles [cpu] = self.addFiles(self.cpuDependentSourceFiles [cpu], files, CPUDependentPathComposer(), FromFreeBSDToRTEMSSourceConverter(), FromRTEMSToFreeBSDSourceConverter(), assertSourceFile) + self.initCPUDependencies(cpu) + self.cpuDependentSourceFiles [cpu] = self.addFiles(self.cpuDependentSourceFiles [cpu], files, CPUDependentPathComposer(), FromFreeBSDToRTEMSSourceConverter(), FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, SourceFileMakefileFragmentComposer()) + + def addTargetSourceCPUDependentSourceFiles(self, targetCPUs, sourceCPU, files): + for cpu in targetCPUs: + self.initCPUDependencies(cpu) + self.cpuDependentSourceFiles [cpu] = self.addFiles(self.cpuDependentSourceFiles [cpu], files, TargetSourceCPUDependentPathComposer(cpu, sourceCPU), FromFreeBSDToRTEMSSourceConverter(), NoConverter(), assertSourceFile, SourceFileMakefileFragmentComposer()) + + def addTest(self, testName, fileFragments, runTest = True): + self.files.append(File(testName, PathComposer(), NoConverter(), NoConverter(), TestMakefileFragementComposer(testName, fileFragments, runTest))) def addDependency(self, dep): self.dependencies.append(dep) @@ -608,300 +593,303 @@ class Module: mm = ModuleManager() rtems = Module('rtems') -rtems.addRTEMSHeaderFiles( - [ - 'rtems/machine/atomic.h', - 'rtems/machine/_bus.h', - 'rtems/machine/bus.h', - 'rtems/machine/bus_dma.h', - 'rtems/machine/rtems-bsd-config.h', - 'rtems/machine/clock.h', - 'rtems/machine/endian.h', - 'rtems/macpue/_limits.h', - 'rtems/machine/_align.h', - 'rtems/machine/mutex.h', - 'rtems/machine/param.h', - 'rtems/machine/pcpu.h', - 'rtems/machine/pmap.h', - 'rtems/machine/proc.h', - 'rtems/machine/resource.h', - 'rtems/machine/runq.h', - 'rtems/machine/signal.h', - 'rtems/machine/stdarg.h', - 'rtems/machine/_stdint.h', - 'rtems/machine/_types.h', - 'rtems/machine/ucontext.h', - 'rtems/machine/cpu.h', - 'rtems/machine/rtems-bsd-symbols.h', - 'rtems/machine/rtems-bsd-cache.h', - 'rtems/machine/rtems-bsd-sysinit.h', - 'rtems/machine/rtems-bsd-select.h', - 'rtems/machine/rtems-bsd-taskqueue.h', - 'rtems/machine/rtems-bsd-bus-dma.h', - 'rtems/machine/rtems-bsd-bus-devicet.h', - 'bsd.h', - ] -) rtems.addRTEMSSourceFiles( [ - 'dev/usb/controller/ohci_lpc24xx.c', - 'dev/usb/controller/ohci_lpc32xx.c', - 'dev/usb/controller/ehci_mpc83xx.c', - 'src/rtems-bsd-thread0-ucred.c', - 'src/rtems-bsd-cam.c', - 'src/rtems-bsd-nexus.c', - 'src/rtems-bsd-autoconf.c', - 'src/rtems-bsd-delay.c', - 'src/rtems-bsd-mutex.c', - 'src/rtems-bsd-thread.c', - 'src/rtems-bsd-condvar.c', - 'src/rtems-bsd-lock.c', - 'src/rtems-bsd-log.c', - 'src/rtems-bsd-sx.c', - 'src/rtems-bsd-rwlock.c', - #'src/rtems-bsd-generic.c', - 'src/rtems-bsd-page.c', - 'src/rtems-bsd-panic.c', - 'src/rtems-bsd-synch.c', - 'src/rtems-bsd-signal.c', - 'src/rtems-bsd-init.c', - 'src/rtems-bsd-init-with-irq.c', - 'src/rtems-bsd-assert.c', - 'src/rtems-bsd-jail.c', - 'src/rtems-bsd-shell.c', - 'src/rtems-bsd-syscalls.c', - 'src/rtems-bsd-smp.c', - #'src/rtems-bsd-socket.c', - #'src/rtems-bsd-mbuf.c', - 'src/rtems-bsd-malloc.c', - 'src/rtems-bsd-support.c', - 'src/rtems-bsd-bus-dma.c', - 'src/rtems-bsd-bus-dma-mbuf.c', - 'src/rtems-bsd-sysctl.c', - 'src/rtems-bsd-sysctlbyname.c', - 'src/rtems-bsd-sysctlnametomib.c', - 'src/rtems-bsd-taskqueue.c', - 'src/rtems-bsd-timesupport.c', - 'src/rtems-bsd-newproc.c', - 'src/rtems-bsd-vm_glue.c', - 'src/rtems-bsd-copyinout.c', - 'src/rtems-bsd-descrip.c', - 'src/rtems-bsd-conf.c', - 'src/rtems-bsd-subr_param.c', - 'src/rtems-bsd-pci_cfgreg.c', - 'src/rtems-bsd-pci_bus.c', - ] -) -rtems.addEmptyHeaderFiles( - [ - 'cam/cam_queue.h', - 'ddb/db_sym.h', - 'ddb/ddb.h', - 'machine/elf.h', - 'machine/sf_buf.h', - 'machine/smp.h', - 'machine/vm.h', - #'machine/vmparam.h', - 'local/linker_if.h', - 'local/opt_bce.h', - 'local/opt_ntp.h', - 'security/audit/audit.h', - 'sys/bio.h', - 'sys/copyright.h', - 'sys/cpuset.h', - 'sys/exec.h', - 'sys/fail.h', - #'sys/limits.h', - 'sys/sleepqueue.h', - 'sys/namei.h', - 'sys/_pthreadtypes.h', - #'sys/resourcevar.h', - 'sys/sched.h', - #'sys/select.h', - 'sys/syscallsubr.h', - 'sys/sysent.h', - 'sys/syslimits.h', - 'sys/sysproto.h', - 'sys/stat.h', - 'sys/ucontext.h', - #'sys/time.h', - 'time.h', - #'sys/timespec.h', - 'sys/_timeval.h', - #'sys/vmmeter.h', - #'sys/vnode.h', - 'vm/pmap.h', - #'vm/uma_int.h', - #'vm/uma_dbg.h', - #'vm/vm_extern.h', - 'vm/vm_map.h', - #'vm/vm_object.h', - #'vm/vm_page.h', - 'vm/vm_param.h', - #'vm/vm_kern.h', - 'geom/geom_disk.h', - #'sys/kdb.h', - #'libkern/jenkins.h', - 'machine/pcb.h', - #'net80211/ieee80211_freebsd.h', - 'netgraph/ng_ipfw.h', - #'sys/sf_buf.h', - ] -) - -local = Module('local') -# RTEMS has its own local/pmap.h -local.addHeaderFiles( - [ - 'local/bus_if.h', - 'local/device_if.h', - 'local/opt_bus.h', - 'local/opt_cam.h', - 'local/opt_compat.h', - 'local/opt_ddb.h', - 'local/opt_hwpmc_hooks.h', - 'local/opt_init_path.h', - 'local/opt_ktrace.h', - 'local/opt_printf.h', - 'local/opt_scsi.h', - 'local/opt_usb.h', - 'local/opt_inet.h', - 'local/opt_inet6.h', - 'local/opt_altq.h', - 'local/opt_atalk.h', - 'local/opt_bootp.h', - 'local/opt_bpf.h', - 'local/opt_bus.h', - 'local/opt_cam.h', - 'local/opt_carp.h', - 'local/opt_compat.h', - 'local/opt_config.h', - 'local/opt_cpu.h', - 'local/opt_ddb.h', - 'local/opt_device_polling.h', - 'local/opt_ef.h', - 'local/opt_enc.h', - 'local/opt_hwpmc_hooks.h', - 'local/opt_inet6.h', - 'local/opt_inet.h', - 'local/opt_init_path.h', - 'local/opt_ipdivert.h', - 'local/opt_ipdn.h', - 'local/opt_ipfw.h', - 'local/opt_ipsec.h', - 'local/opt_ipstealth.h', - 'local/opt_ipx.h', - 'local/opt_kdb.h', - 'local/opt_kdtrace.h', - 'local/opt_ktrace.h', - 'local/opt_mbuf_profiling.h', - 'local/opt_mbuf_stress_test.h', - 'local/opt_mpath.h', - 'local/opt_mrouting.h', - 'local/opt_natm.h', - 'local/opt_netgraph.h', - 'local/opt_param.h', - 'local/opt_posix.h', - 'local/opt_pf.h', - 'local/opt_printf.h', - 'local/opt_route.h', - 'local/opt_scsi.h', - 'local/opt_sctp.h', - 'local/opt_tcpdebug.h', - 'local/opt_tdma.h', - 'local/opt_usb.h', - 'local/opt_vlan.h', - 'local/opt_wlan.h', - 'local/opt_zero.h', - 'local/usbdevs_data.h', - 'local/usbdevs.h', - 'local/usb_if.h', - 'local/vnode_if.h', - 'local/vnode_if_newproto.h', - 'local/vnode_if_typedef.h', - 'local/cryptodev_if.h', - 'local/miibus_if.h', - 'local/miidevs.h', - 'local/pci_if.h', - 'local/pcib_if.h', - ] -) -local.addSourceFiles( - [ - 'local/usb_if.c', 'local/bus_if.c', - 'local/device_if.c', 'local/cryptodev_if.c', + 'local/device_if.c', 'local/miibus_if.c', - 'local/pci_if.c', 'local/pcib_if.c', + 'local/pci_if.c', + 'local/usb_if.c', + 'rtems/ipsec_get_policylen.c', + 'rtems/rtems-bsd-assert.c', + 'rtems/rtems-bsd-autoconf.c', + 'rtems/rtems-bsd-bus-dma.c', + 'rtems/rtems-bsd-bus-dma-mbuf.c', + 'rtems/rtems-bsd-cam.c', + 'rtems/rtems-bsd-condvar.c', + 'rtems/rtems-bsd-conf.c', + 'rtems/rtems-bsd-copyinout.c', + 'rtems/rtems-bsd-delay.c', + 'rtems/rtems-bsd-descrip.c', + 'rtems/rtems-bsd-init.c', + 'rtems/rtems-bsd-init-with-irq.c', + 'rtems/rtems-bsd-jail.c', + 'rtems/rtems-bsd-lock.c', + 'rtems/rtems-bsd-log.c', + 'rtems/rtems-bsd-malloc.c', + 'rtems/rtems-bsd-mutex.c', + 'rtems/rtems-bsd-newproc.c', + 'rtems/rtems-bsd-nexus.c', + 'rtems/rtems-bsd-page.c', + 'rtems/rtems-bsd-panic.c', + 'rtems/rtems-bsd-pci_bus.c', + 'rtems/rtems-bsd-pci_cfgreg.c', + 'rtems/rtems-bsd-rwlock.c', + 'rtems/rtems-bsd-shell.c', + 'rtems/rtems-bsd-signal.c', + 'rtems/rtems-bsd-smp.c', + 'rtems/rtems-bsd-subr_param.c', + 'rtems/rtems-bsd-support.c', + 'rtems/rtems-bsd-sx.c', + 'rtems/rtems-bsd-synch.c', + 'rtems/rtems-bsd-syscall-api.c', + 'rtems/rtems-bsd-syscalls.c', + 'rtems/rtems-bsd-sysctlbyname.c', + 'rtems/rtems-bsd-sysctl.c', + 'rtems/rtems-bsd-sysctlnametomib.c', + 'rtems/rtems-bsd-taskqueue.c', + 'rtems/rtems-bsd-thread0-ucred.c', + 'rtems/rtems-bsd-thread.c', + 'rtems/rtems-bsd-timesupport.c', + 'rtems/rtems-bsd-vm_glue.c', + 'rtems/rtems-getprogname.c', + 'rtems/rtems-kvm.c', + 'rtems/rtems-net-setup.c', + 'rtems/rtems-shell.c', + 'rtems/rtems-syslog-initialize.c', + 'rtems/rtems-syspoll.c', + 'rtems/rtems-uthread_kevent.c', + 'rtems/rtems-uthread_kqueue.c', + 'rtems/syslog.c', + 'sys/dev/usb/controller/ehci_mpc83xx.c', + 'sys/dev/usb/controller/ohci_lpc24xx.c', + 'sys/dev/usb/controller/ohci_lpc32xx.c', + ] +) + +class KVMSymbolsMakefileFragmentComposer(MakefileFragmentComposer): + def compose(self, path): + return 'LIB_GEN_FILES += ' + path + '\n' \ + 'LIB_C_FILES += ' + path + '\n' \ + + path + ': rtemsbsd/rtems/generate_kvm_symbols\n' \ + '\t./$< > $@\n' + +rtems.addFile(File('rtems/rtems-kvm-symbols.c', RTEMSPathComposer(), NoConverter(), NoConverter(), KVMSymbolsMakefileFragmentComposer())) + +base = Module('base') +base.addHeaderFiles( + [ + 'sys/bsm/audit.h', + 'sys/bsm/audit_kevents.h', + 'sys/fs/devfs/devfs_int.h', + 'sys/security/mac/mac_framework.h', + 'sys/sys/acl.h', + 'sys/sys/aio.h', + 'sys/sys/bitstring.h', + 'sys/sys/bufobj.h', + 'sys/sys/buf_ring.h', + 'sys/sys/_bus_dma.h', + 'sys/sys/bus_dma.h', + 'sys/sys/bus.h', + 'sys/sys/callout.h', + 'sys/sys/condvar.h', + 'sys/sys/conf.h', + 'sys/sys/cpu.h', + 'sys/sys/ctype.h', + 'sys/sys/domain.h', + 'sys/sys/endian.h', + 'sys/sys/event.h', + 'sys/sys/eventhandler.h', + 'sys/sys/fcntl.h', + 'sys/sys/filedesc.h', + 'sys/sys/file.h', + 'sys/sys/filio.h', + 'sys/sys/fnv_hash.h', + 'sys/sys/hash.h', + 'sys/sys/interrupt.h', + 'sys/sys/jail.h', + 'sys/sys/kernel.h', + 'sys/sys/kobj.h', + 'sys/sys/kthread.h', + 'sys/sys/ktr.h', + 'sys/sys/libkern.h', + 'sys/sys/limits.h', + 'sys/sys/linker.h', + 'sys/sys/linker_set.h', + 'sys/sys/_lock.h', + 'sys/sys/_lockmgr.h', + 'sys/sys/lockmgr.h', + 'sys/sys/lock_profile.h', + 'sys/sys/lockstat.h', + 'sys/sys/mac.h', + 'sys/sys/malloc.h', + 'sys/sys/mbuf.h', + 'sys/sys/module.h', + 'sys/sys/mount.h', + 'sys/sys/_mutex.h', + 'sys/sys/mutex.h', + 'sys/sys/_null.h', + 'sys/sys/osd.h', + 'sys/sys/pcpu.h', + 'sys/sys/poll.h', + 'sys/sys/priority.h', + 'sys/sys/priv.h', + 'sys/sys/proc.h', + 'sys/sys/protosw.h', + 'sys/sys/queue.h', + 'sys/sys/random.h', + 'sys/sys/reboot.h', + 'sys/sys/refcount.h', + 'sys/sys/resourcevar.h', + 'sys/sys/rman.h', + 'sys/sys/_rmlock.h', + 'sys/sys/rmlock.h', + 'sys/sys/rtprio.h', + 'sys/sys/runq.h', + 'sys/sys/_rwlock.h', + 'sys/sys/rwlock.h', + 'sys/sys/sbuf.h', + 'sys/sys/sdt.h', + 'sys/sys/select.h', + 'sys/sys/selinfo.h', + 'sys/sys/_semaphore.h', + 'sys/sys/sf_buf.h', + 'sys/sys/sigio.h', + 'sys/sys/_sigset.h', + 'sys/sys/smp.h', + 'sys/sys/sockbuf.h', + 'sys/sys/socket.h', + 'sys/sys/socketvar.h', + 'sys/sys/sockio.h', + 'sys/sys/sockopt.h', + 'sys/sys/sockstate.h', + 'sys/sys/stddef.h', + 'sys/sys/stdint.h', + 'sys/sys/_sx.h', + 'sys/sys/sx.h', + 'sys/sys/sysctl.h', + 'sys/sys/syslog.h', + 'sys/sys/systm.h', + 'sys/sys/_task.h', + 'sys/sys/taskqueue.h', + 'sys/sys/nlist_aout.h', + 'sys/rpc/types.h', + 'sys/sys/timepps.h', + 'sys/sys/timetc.h', + 'sys/sys/_timeval.h', + 'sys/sys/timex.h', + 'sys/sys/tree.h', + 'sys/sys/ttycom.h', + 'sys/sys/ucred.h', + 'sys/sys/un.h', + 'sys/sys/vmmeter.h', + 'sys/vm/uma_dbg.h', + 'sys/vm/uma.h', + 'sys/vm/uma_int.h', + 'sys/vm/vm.h', + ] +) +base.addSourceFiles( + [ + 'sys/kern/init_main.c', + 'sys/kern/kern_descrip.c', + 'sys/kern/kern_environment.c', + 'sys/kern/kern_event.c', + 'sys/kern/kern_intr.c', + 'sys/kern/kern_linker.c', + 'sys/kern/kern_mbuf.c', + 'sys/kern/kern_mib.c', + 'sys/kern/kern_module.c', + 'sys/kern/kern_mtxpool.c', + 'sys/kern/kern_ntptime.c', + 'sys/kern/kern_proc.c', + 'sys/kern/kern_prot.c', + 'sys/kern/kern_resource.c', + 'sys/kern/kern_subr.c', + 'sys/kern/kern_sysctl.c', + 'sys/kern/kern_tc.c', + 'sys/kern/kern_time.c', + 'sys/kern/kern_timeout.c', + 'sys/kern/subr_bufring.c', + 'sys/kern/subr_bus.c', + 'sys/kern/subr_eventhandler.c', + 'sys/kern/subr_hints.c', + 'sys/kern/subr_kobj.c', + 'sys/kern/subr_module.c', + 'sys/kern/subr_rman.c', + 'sys/kern/subr_sbuf.c', + 'sys/kern/subr_unit.c', + 'sys/kern/sys_generic.c', + 'sys/kern/uipc_accf.c', + 'sys/kern/uipc_domain.c', + 'sys/kern/uipc_mbuf2.c', + 'sys/kern/uipc_mbuf.c', + 'sys/kern/uipc_sockbuf.c', + 'sys/kern/uipc_socket.c', + 'sys/libkern/arc4random.c', + 'sys/libkern/fls.c', + 'sys/libkern/inet_ntoa.c', + 'sys/libkern/random.c', + 'sys/vm/uma_core.c', ] ) devUsb = Module('dev_usb') devUsb.addHeaderFiles( [ - 'dev/usb/ufm_ioctl.h', - 'dev/usb/usb_busdma.h', - 'dev/usb/usb_bus.h', - 'dev/usb/usb_cdc.h', - 'dev/usb/usb_controller.h', - 'dev/usb/usb_core.h', - 'dev/usb/usb_debug.h', - 'dev/usb/usb_dev.h', - 'dev/usb/usb_device.h', - 'dev/usb/usbdi.h', - 'dev/usb/usbdi_util.h', - 'dev/usb/usb_dynamic.h', - 'dev/usb/usb_endian.h', - 'dev/usb/usb_freebsd.h', - 'dev/usb/usb_generic.h', - 'dev/usb/usb.h', - 'dev/usb/usbhid.h', - 'dev/usb/usb_hub.h', - 'dev/usb/usb_ioctl.h', - 'dev/usb/usb_mbuf.h', - 'dev/usb/usb_msctest.h', - 'dev/usb/usb_process.h', - 'dev/usb/usb_request.h', - 'dev/usb/usb_transfer.h', - 'dev/usb/usb_util.h', + 'sys/dev/usb/ufm_ioctl.h', + 'sys/dev/usb/usb_busdma.h', + 'sys/dev/usb/usb_bus.h', + 'sys/dev/usb/usb_cdc.h', + 'sys/dev/usb/usb_controller.h', + 'sys/dev/usb/usb_core.h', + 'sys/dev/usb/usb_debug.h', + 'sys/dev/usb/usb_dev.h', + 'sys/dev/usb/usb_device.h', + 'sys/dev/usb/usbdi.h', + 'sys/dev/usb/usbdi_util.h', + 'sys/dev/usb/usb_dynamic.h', + 'sys/dev/usb/usb_endian.h', + 'sys/dev/usb/usb_freebsd.h', + 'sys/dev/usb/usb_generic.h', + 'sys/dev/usb/usb.h', + 'sys/dev/usb/usbhid.h', + 'sys/dev/usb/usb_hub.h', + 'sys/dev/usb/usb_ioctl.h', + 'sys/dev/usb/usb_mbuf.h', + 'sys/dev/usb/usb_msctest.h', + 'sys/dev/usb/usb_process.h', + 'sys/dev/usb/usb_request.h', + 'sys/dev/usb/usb_transfer.h', + 'sys/dev/usb/usb_util.h', ] ) devUsb.addSourceFiles( [ - 'dev/usb/usb_busdma.c', - 'dev/usb/usb_core.c', - 'dev/usb/usb_debug.c', - 'dev/usb/usb_dev.c', - 'dev/usb/usb_device.c', - 'dev/usb/usb_dynamic.c', - 'dev/usb/usb_error.c', - 'dev/usb/usb_generic.c', - 'dev/usb/usb_handle_request.c', - 'dev/usb/usb_hid.c', - 'dev/usb/usb_hub.c', - 'dev/usb/usb_lookup.c', - 'dev/usb/usb_mbuf.c', - 'dev/usb/usb_msctest.c', - 'dev/usb/usb_parse.c', - 'dev/usb/usb_process.c', - 'dev/usb/usb_request.c', - 'dev/usb/usb_transfer.c', - 'dev/usb/usb_util.c', + 'sys/dev/usb/usb_busdma.c', + 'sys/dev/usb/usb_core.c', + 'sys/dev/usb/usb_debug.c', + 'sys/dev/usb/usb_dev.c', + 'sys/dev/usb/usb_device.c', + 'sys/dev/usb/usb_dynamic.c', + 'sys/dev/usb/usb_error.c', + 'sys/dev/usb/usb_generic.c', + 'sys/dev/usb/usb_handle_request.c', + 'sys/dev/usb/usb_hid.c', + 'sys/dev/usb/usb_hub.c', + 'sys/dev/usb/usb_lookup.c', + 'sys/dev/usb/usb_mbuf.c', + 'sys/dev/usb/usb_msctest.c', + 'sys/dev/usb/usb_parse.c', + 'sys/dev/usb/usb_process.c', + 'sys/dev/usb/usb_request.c', + 'sys/dev/usb/usb_transfer.c', + 'sys/dev/usb/usb_util.c', ] ) devUsbAddOn = Module('dev_usb_add_on') devUsbAddOn.addHeaderFiles( [ - 'dev/usb/usb_pci.h', - 'dev/usb/usb_compat_linux.h', + 'sys/dev/usb/usb_pci.h', + 'sys/dev/usb/usb_compat_linux.h', ] ) devUsbAddOn.addSourceFiles( [ - 'dev/usb/usb_compat_linux.c', + 'sys/dev/usb/usb_compat_linux.c', ] ) @@ -909,13 +897,13 @@ devUsbBluetooth = Module('dev_usb_bluetooth') devUsbBluetooth.addDependency(devUsb) devUsbBluetooth.addHeaderFiles( [ - 'dev/usb/bluetooth/ng_ubt_var.h', + 'sys/dev/usb/bluetooth/ng_ubt_var.h', ] ) devUsbBluetooth.addSourceFiles( [ - 'dev/usb/bluetooth/ng_ubt.c', - 'dev/usb/bluetooth/ubtbcmfw.c', + 'sys/dev/usb/bluetooth/ng_ubt.c', + 'sys/dev/usb/bluetooth/ubtbcmfw.c', ] ) @@ -923,17 +911,17 @@ devUsbController = Module('dev_usb_controller') devUsbController.addDependency(devUsb) devUsbController.addHeaderFiles( [ - 'dev/usb/controller/ohci.h', - 'dev/usb/controller/ohcireg.h', - 'dev/usb/controller/ehci.h', - 'dev/usb/controller/ehcireg.h', + 'sys/dev/usb/controller/ohci.h', + 'sys/dev/usb/controller/ohcireg.h', + 'sys/dev/usb/controller/ehci.h', + 'sys/dev/usb/controller/ehcireg.h', ] ) devUsbController.addSourceFiles( [ - 'dev/usb/controller/ohci.c', - 'dev/usb/controller/ehci.c', - 'dev/usb/controller/usb_controller.c', + 'sys/dev/usb/controller/ohci.c', + 'sys/dev/usb/controller/ehci.c', + 'sys/dev/usb/controller/usb_controller.c', ] ) @@ -941,28 +929,28 @@ devUsbControllerAddOn = Module('dev_usb_controller_add_on') devUsbControllerAddOn.addDependency(devUsb) devUsbControllerAddOn.addHeaderFiles( [ - 'dev/usb/controller/at91dci.h', - 'dev/usb/controller/atmegadci.h', - 'dev/usb/controller/musb_otg.h', - 'dev/usb/controller/uss820dci.h', + 'sys/dev/usb/controller/at91dci.h', + 'sys/dev/usb/controller/atmegadci.h', + 'sys/dev/usb/controller/musb_otg.h', + 'sys/dev/usb/controller/uss820dci.h', ] ) devUsbControllerAddOn.addSourceFiles( [ - 'dev/usb/controller/at91dci_atmelarm.c', - 'dev/usb/controller/at91dci.c', - 'dev/usb/controller/atmegadci_atmelarm.c', - 'dev/usb/controller/atmegadci.c', - 'dev/usb/controller/ehci_ixp4xx.c', - 'dev/usb/controller/ehci_pci.c', - 'dev/usb/controller/musb_otg.c', - 'dev/usb/controller/ehci_mbus.c', - 'dev/usb/controller/musb_otg_atmelarm.c', - 'dev/usb/controller/ohci_atmelarm.c', - 'dev/usb/controller/ohci_pci.c', - 'dev/usb/controller/uhci_pci.c', - 'dev/usb/controller/uss820dci_atmelarm.c', - 'dev/usb/controller/uss820dci.c', + 'sys/dev/usb/controller/at91dci_atmelarm.c', + 'sys/dev/usb/controller/at91dci.c', + 'sys/dev/usb/controller/atmegadci_atmelarm.c', + 'sys/dev/usb/controller/atmegadci.c', + 'sys/dev/usb/controller/ehci_ixp4xx.c', + 'sys/dev/usb/controller/ehci_pci.c', + 'sys/dev/usb/controller/musb_otg.c', + 'sys/dev/usb/controller/ehci_mbus.c', + 'sys/dev/usb/controller/musb_otg_atmelarm.c', + 'sys/dev/usb/controller/ohci_atmelarm.c', + 'sys/dev/usb/controller/ohci_pci.c', + 'sys/dev/usb/controller/uhci_pci.c', + 'sys/dev/usb/controller/uss820dci_atmelarm.c', + 'sys/dev/usb/controller/uss820dci.c', ] ) @@ -970,13 +958,13 @@ devUsbInput = Module('dev_usb_input') devUsbInput.addDependency(devUsb) devUsbInput.addHeaderFiles( [ - 'dev/usb/input/usb_rdesc.h', + 'sys/dev/usb/input/usb_rdesc.h', ] ) devUsbInput.addSourceFiles( [ - 'dev/usb/input/uhid.c', - 'dev/usb/input/ukbd.c', + 'sys/dev/usb/input/uhid.c', + 'sys/dev/usb/input/ukbd.c', ] ) @@ -984,18 +972,18 @@ devUsbInputMouse = Module('dev_usb_mouse') devUsbInputMouse.addDependency(devUsb) devUsbInputMouse.addHeaderFiles( [ - 'sys/tty.h', - 'sys/mouse.h', - 'sys/ttyqueue.h', - 'sys/ttydefaults.h', - 'sys/ttydisc.h', - 'sys/ttydevsw.h', - 'sys/ttyhook.h', + 'sys/sys/tty.h', + 'sys/sys/mouse.h', + 'sys/sys/ttyqueue.h', + 'sys/sys/ttydefaults.h', + 'sys/sys/ttydisc.h', + 'sys/sys/ttydevsw.h', + 'sys/sys/ttyhook.h', ] ) devUsbInputMouse.addSourceFiles( [ - 'dev/usb/input/ums.c', + 'sys/dev/usb/input/ums.c', ] ) @@ -1003,13 +991,13 @@ devUsbMisc = Module('dev_usb_misc') devUsbMisc.addDependency(devUsb) devUsbMisc.addHeaderFiles( [ - 'dev/usb/misc/udbp.h', + 'sys/dev/usb/misc/udbp.h', ] ) devUsbMisc.addSourceFiles( [ - 'dev/usb/misc/udbp.c', - 'dev/usb/misc/ufm.c', + 'sys/dev/usb/misc/udbp.c', + 'sys/dev/usb/misc/ufm.c', ] ) @@ -1017,25 +1005,16 @@ devUsbNet = Module('dev_usb_net') devUsbNet.addDependency(devUsb) devUsbNet.addHeaderFiles( [ - 'dev/mii/mii.h', - 'dev/mii/miivar.h', - 'net/bpf.h', - 'net/ethernet.h', - 'net/if_arp.h', - 'net/if_dl.h', - 'net/if.h', - 'net/if_media.h', - 'net/if_types.h', - 'net/if_var.h', - 'net/vnet.h', - 'dev/usb/net/if_cdcereg.h', - 'dev/usb/net/usb_ethernet.h', + 'sys/dev/mii/mii.h', + 'sys/dev/mii/miivar.h', + 'sys/dev/usb/net/if_cdcereg.h', + 'sys/dev/usb/net/usb_ethernet.h', ] ) devUsbNet.addSourceFiles( [ - 'dev/usb/net/if_cdce.c', - 'dev/usb/net/usb_ethernet.c', + 'sys/dev/usb/net/if_cdce.c', + 'sys/dev/usb/net/usb_ethernet.c', ] ) @@ -1043,12 +1022,12 @@ devUsbQuirk = Module('dev_usb_quirk') devUsbQuirk.addDependency(devUsb) devUsbQuirk.addHeaderFiles( [ - 'dev/usb/quirk/usb_quirk.h', + 'sys/dev/usb/quirk/usb_quirk.h', ] ) devUsbQuirk.addSourceFiles( [ - 'dev/usb/quirk/usb_quirk.c', + 'sys/dev/usb/quirk/usb_quirk.c', ] ) @@ -1056,31 +1035,31 @@ devUsbSerial = Module('dev_usb_serial') devUsbSerial.addDependency(devUsb) devUsbSerial.addHeaderFiles( [ - 'dev/usb/serial/uftdi_reg.h', - 'dev/usb/serial/usb_serial.h', + 'sys/dev/usb/serial/uftdi_reg.h', + 'sys/dev/usb/serial/usb_serial.h', ] ) devUsbSerial.addSourceFiles( [ - 'dev/usb/serial/u3g.c', - 'dev/usb/serial/uark.c', - 'dev/usb/serial/ubsa.c', - 'dev/usb/serial/ubser.c', - 'dev/usb/serial/uchcom.c', - 'dev/usb/serial/ucycom.c', - 'dev/usb/serial/ufoma.c', - 'dev/usb/serial/uftdi.c', - 'dev/usb/serial/ugensa.c', - 'dev/usb/serial/uipaq.c', - 'dev/usb/serial/ulpt.c', - 'dev/usb/serial/umct.c', - 'dev/usb/serial/umodem.c', - 'dev/usb/serial/umoscom.c', - 'dev/usb/serial/uplcom.c', - 'dev/usb/serial/usb_serial.c', - 'dev/usb/serial/uslcom.c', - 'dev/usb/serial/uvisor.c', - 'dev/usb/serial/uvscom.c', + 'sys/dev/usb/serial/u3g.c', + 'sys/dev/usb/serial/uark.c', + 'sys/dev/usb/serial/ubsa.c', + 'sys/dev/usb/serial/ubser.c', + 'sys/dev/usb/serial/uchcom.c', + 'sys/dev/usb/serial/ucycom.c', + 'sys/dev/usb/serial/ufoma.c', + 'sys/dev/usb/serial/uftdi.c', + 'sys/dev/usb/serial/ugensa.c', + 'sys/dev/usb/serial/uipaq.c', + 'sys/dev/usb/serial/ulpt.c', + 'sys/dev/usb/serial/umct.c', + 'sys/dev/usb/serial/umodem.c', + 'sys/dev/usb/serial/umoscom.c', + 'sys/dev/usb/serial/uplcom.c', + 'sys/dev/usb/serial/usb_serial.c', + 'sys/dev/usb/serial/uslcom.c', + 'sys/dev/usb/serial/uvisor.c', + 'sys/dev/usb/serial/uvscom.c', ] ) @@ -1088,7 +1067,7 @@ devUsbStorage = Module('dev_usb_storage') devUsbStorage.addDependency(devUsb) devUsbStorage.addSourceFiles( [ - 'dev/usb/storage/umass.c', + 'sys/dev/usb/storage/umass.c', ] ) @@ -1096,13 +1075,13 @@ devUsbStorageAddOn = Module('dev_usb_storage_add_on') devUsbStorageAddOn.addDependency(devUsb) devUsbStorageAddOn.addHeaderFiles( [ - 'dev/usb/storage/rio500_usb.h', + 'sys/dev/usb/storage/rio500_usb.h', ] ) devUsbStorageAddOn.addSourceFiles( [ - 'dev/usb/storage/urio.c', - 'dev/usb/storage/ustorage_fs.c', + 'sys/dev/usb/storage/urio.c', + 'sys/dev/usb/storage/ustorage_fs.c', ] ) @@ -1110,15 +1089,15 @@ devUsbTemplate = Module('dev_usb_template') devUsbTemplate.addDependency(devUsb) devUsbTemplate.addHeaderFiles( [ - 'dev/usb/template/usb_template.h', + 'sys/dev/usb/template/usb_template.h', ] ) devUsbTemplate.addSourceFiles( [ - 'dev/usb/template/usb_template.c', - 'dev/usb/template/usb_template_cdce.c', - 'dev/usb/template/usb_template_msc.c', - 'dev/usb/template/usb_template_mtp.c', + 'sys/dev/usb/template/usb_template.c', + 'sys/dev/usb/template/usb_template_cdce.c', + 'sys/dev/usb/template/usb_template_msc.c', + 'sys/dev/usb/template/usb_template_mtp.c', ] ) @@ -1126,201 +1105,76 @@ devUsbWlan = Module('dev_usb_wlan') devUsbWlan.addDependency(devUsb) devUsbWlan.addHeaderFiles( [ - 'dev/usb/wlan/if_rumfw.h', - 'dev/usb/wlan/if_rumreg.h', - 'dev/usb/wlan/if_rumvar.h', - 'dev/usb/wlan/if_uathreg.h', - 'dev/usb/wlan/if_uathvar.h', - 'dev/usb/wlan/if_upgtvar.h', - 'dev/usb/wlan/if_uralreg.h', - 'dev/usb/wlan/if_uralvar.h', - 'dev/usb/wlan/if_zydfw.h', - 'dev/usb/wlan/if_zydreg.h', + 'sys/dev/usb/wlan/if_rumfw.h', + 'sys/dev/usb/wlan/if_rumreg.h', + 'sys/dev/usb/wlan/if_rumvar.h', + 'sys/dev/usb/wlan/if_uathreg.h', + 'sys/dev/usb/wlan/if_uathvar.h', + 'sys/dev/usb/wlan/if_upgtvar.h', + 'sys/dev/usb/wlan/if_uralreg.h', + 'sys/dev/usb/wlan/if_uralvar.h', + 'sys/dev/usb/wlan/if_zydfw.h', + 'sys/dev/usb/wlan/if_zydreg.h', ] ) devUsbWlan.addSourceFiles( [ - 'dev/usb/wlan/if_rum.c', - 'dev/usb/wlan/if_uath.c', - 'dev/usb/wlan/if_upgt.c', - 'dev/usb/wlan/if_ural.c', - 'dev/usb/wlan/if_zyd.c', - ] -) - -devPci = Module('dev_pci') -devPci.addHeaderFiles( - [ - 'dev/pci/pcireg.h', - 'dev/pci/pcivar.h', - ] -) - -devUsbBase = Module('dev_usb_base') -devUsbBase.addHeaderFiles( - [ - 'bsm/audit.h', - 'bsm/audit_kevents.h', - 'sys/acl.h', - 'sys/bufobj.h', - 'sys/_bus_dma.h', - 'sys/bus_dma.h', - 'sys/bus.h', - 'sys/callout.h', - 'sys/condvar.h', - 'sys/conf.h', - #'sys/cpuset.h', - 'sys/ctype.h', - 'sys/endian.h', - 'sys/errno.h', - 'sys/event.h', - 'sys/eventhandler.h', - 'sys/fcntl.h', - 'sys/filedesc.h', - 'sys/file.h', - 'sys/filio.h', - 'sys/ioccom.h', - # FreeBSD version is in RTEMS since used by readv/writev - # 'sys/_iovec.h', - 'sys/kernel.h', - 'sys/kobj.h', - 'sys/kthread.h', - 'sys/ktr.h', - 'sys/libkern.h', - 'sys/linker_set.h', - 'sys/_lock.h', - 'sys/lock.h', - 'sys/_lockmgr.h', - 'sys/lockmgr.h', - 'sys/lock_profile.h', - 'sys/lockstat.h', - 'sys/mac.h', - 'sys/malloc.h', - 'sys/mbuf.h', - 'sys/module.h', - 'sys/mount.h', - 'sys/_mutex.h', - 'sys/mutex.h', - 'sys/_null.h', - 'sys/osd.h', - 'sys/param.h', - 'sys/pcpu.h', - 'sys/poll.h', - 'sys/priority.h', - 'sys/priv.h', - 'sys/proc.h', - 'sys/queue.h', - 'sys/refcount.h', - 'sys/resource.h', - 'sys/resourcevar.h', - 'sys/rtprio.h', - 'sys/runq.h', - 'sys/_rwlock.h', - 'sys/rwlock.h', - 'sys/_semaphore.h', - 'sys/selinfo.h', - 'sys/sigio.h', - 'sys/_sigset.h', - #'sys/sleepqueue.h', - 'sys/socket.h', - 'sys/stddef.h', - 'sys/stdint.h', - 'sys/_sx.h', - 'sys/sx.h', - 'sys/sysctl.h', - 'sys/systm.h', - 'sys/ttycom.h', - 'sys/_types.h', - 'sys/types.h', - 'sys/ucred.h', - # FreeBSD version is in RTEMS since used by readv/writev - # 'sys/uio.h', - 'sys/aio.h', - 'sys/unistd.h', - 'sys/vmmeter.h', - #'sys/vnode.h', - 'sys/rman.h', - 'sys/reboot.h', - 'sys/bitstring.h', - 'sys/linker.h', - 'vm/uma.h', - 'vm/uma_int.h', - 'vm/uma_dbg.h', - 'vm/vm.h', - #'vm/vm_page.h', - 'fs/devfs/devfs_int.h', - ] -) -devUsbBase.addSourceFiles( - [ - 'kern/init_main.c', - 'kern/kern_linker.c', - 'kern/kern_mib.c', - 'kern/kern_timeout.c', - 'kern/kern_mbuf.c', - 'kern/kern_module.c', - 'kern/kern_sysctl.c', - 'kern/subr_bus.c', - 'kern/subr_kobj.c', - #'kern/subr_sleepqueue.c', - 'kern/uipc_mbuf.c', - 'kern/uipc_mbuf2.c', - 'kern/uipc_socket.c', - 'kern/uipc_sockbuf.c', - 'kern/uipc_domain.c', - #'kern/uipc_syscalls.c', - 'vm/uma_core.c', + 'sys/dev/usb/wlan/if_rum.c', + 'sys/dev/usb/wlan/if_uath.c', + 'sys/dev/usb/wlan/if_upgt.c', + 'sys/dev/usb/wlan/if_ural.c', + 'sys/dev/usb/wlan/if_zyd.c', ] ) cam = Module('cam') cam.addHeaderFiles( [ - 'sys/ata.h', - 'cam/cam.h', - 'cam/cam_ccb.h', - 'cam/cam_sim.h', - 'cam/cam_xpt_sim.h', - 'cam/scsi/scsi_all.h', - 'cam/scsi/scsi_da.h', - 'cam/ata/ata_all.h', - 'cam/cam_periph.h', - 'cam/cam_debug.h', - 'cam/cam_xpt.h', + 'sys/sys/ata.h', + 'sys/cam/cam.h', + 'sys/cam/cam_ccb.h', + 'sys/cam/cam_sim.h', + 'sys/cam/cam_xpt_sim.h', + 'sys/cam/scsi/scsi_all.h', + 'sys/cam/scsi/scsi_da.h', + 'sys/cam/ata/ata_all.h', + 'sys/cam/cam_periph.h', + 'sys/cam/cam_debug.h', + 'sys/cam/cam_xpt.h', ] ) cam.addSourceFiles( [ - 'cam/cam.c', - 'cam/scsi/scsi_all.c', + 'sys/cam/cam.c', + 'sys/cam/scsi/scsi_all.c', ] ) devNet = Module('dev_net') devNet.addHeaderFiles( [ - 'dev/mii/mii.h', - 'dev/mii/miivar.h', - 'dev/mii/brgphyreg.h', - 'dev/mii/icsphyreg.h', - 'dev/led/led.h', - 'net/bpf.h', - 'net/ethernet.h', - 'net/if_arp.h', - 'net/if_dl.h', - 'net/if.h', - 'net/if_media.h', - 'net/if_types.h', - 'net/if_var.h', - 'net/vnet.h', + 'sys/dev/mii/mii.h', + 'sys/dev/mii/miivar.h', + 'sys/dev/mii/brgphyreg.h', + 'sys/dev/mii/icsphyreg.h', + 'sys/dev/led/led.h', + 'sys/net/bpf.h', + 'sys/net/ethernet.h', + 'sys/net/if_arp.h', + 'sys/net/if_dl.h', + 'sys/net/if.h', + 'sys/net/if_media.h', + 'sys/net/if_types.h', + 'sys/net/if_var.h', + 'sys/net/vnet.h', ] ) devNet.addSourceFiles( [ - 'dev/mii/mii.c', - 'dev/mii/mii_physubr.c', - 'dev/mii/icsphy.c', - 'dev/mii/brgphy.c', + 'sys/dev/mii/mii.c', + 'sys/dev/mii/mii_physubr.c', + 'sys/dev/mii/icsphy.c', + 'sys/dev/mii/brgphy.c', ] ) @@ -1328,175 +1182,138 @@ devNic = Module('dev_nic') devNic.addHeaderFiles( [ # 'sys/taskqueue.h', - 'sys/pciio.h', - 'dev/random/randomdev_soft.h', - 'sys/eventvar.h', - 'sys/kenv.h', - 'dev/pci/pci_private.h', - 'dev/pci/pcib_private.h', - 'isa/isavar.h', - 'isa/pnpvar.h', - 'netatalk/at.h', - 'netatalk/endian.h', - 'netatalk/aarp.h', - 'netatalk/at_extern.h', - 'netatalk/at_var.h', - 'netatalk/ddp.h', - 'netatalk/ddp_pcb.h', - 'netatalk/ddp_var.h', - 'netatalk/phase2.h', - 'sys/mman.h', - 'sys/buf.h', - 'sys/mqueue.h', - 'sys/tty.h', - 'sys/ttyqueue.h', - 'sys/ttydisc.h', - 'sys/ttydevsw.h', - 'sys/ttyhook.h', - 'sys/user.h', + 'sys/sys/pciio.h', + 'sys/dev/random/randomdev_soft.h', + 'sys/sys/eventvar.h', + 'sys/sys/kenv.h', + 'sys/isa/isavar.h', + 'sys/isa/pnpvar.h', + 'sys/netatalk/at.h', + 'sys/netatalk/endian.h', + 'sys/netatalk/aarp.h', + 'sys/netatalk/at_extern.h', + 'sys/netatalk/at_var.h', + 'sys/netatalk/ddp.h', + 'sys/netatalk/ddp_pcb.h', + 'sys/netatalk/ddp_var.h', + 'sys/netatalk/phase2.h', + 'sys/sys/mman.h', + 'sys/sys/buf.h', + 'sys/sys/mqueue.h', + 'sys/sys/tty.h', + 'sys/sys/ttyqueue.h', + 'sys/sys/ttydisc.h', + 'sys/sys/ttydevsw.h', + 'sys/sys/ttyhook.h', + 'sys/sys/user.h', ] ) devNic.addCPUDependentHeaderFiles( [ - 'arm/include/cpufunc.h', - 'i386/include/specialreg.h', - 'i386/include/md_var.h', - 'i386/include/intr_machdep.h', - 'i386/include/legacyvar.h', - 'i386/include/pci_cfgreg.h', - 'i386/include/cpufunc.h', - 'mips/include/cpufunc.h', - 'mips/include/cpuregs.h', - 'powerpc/include/cpufunc.h', - 'powerpc/include/psl.h', - 'powerpc/include/spr.h', - 'sparc64/include/cpufunc.h', - 'sparc64/include/asi.h', - 'sparc64/include/pstate.h', - ] -) - -devNic.addCPUDependentSourceFiles( - 'i386', - [ - 'i386/pci/pci_bus.c', - 'i386/i386/legacy.c', + 'sys/arm/include/cpufunc.h', + 'sys/i386/include/specialreg.h', + 'sys/i386/include/md_var.h', + 'sys/i386/include/intr_machdep.h', + 'sys/i386/include/cpufunc.h', + 'sys/mips/include/cpufunc.h', + 'sys/mips/include/cpuregs.h', + 'sys/powerpc/include/cpufunc.h', + 'sys/powerpc/include/psl.h', + 'sys/powerpc/include/spr.h', + 'sys/sparc64/include/cpufunc.h', + 'sys/sparc64/include/asi.h', + 'sys/sparc64/include/pstate.h', ] ) devNic.addSourceFiles( [ - # 'kern/subr_taskqueue.c', - 'kern/subr_hints.c', - 'dev/random/harvest.c', - 'libkern/random.c', - 'libkern/arc4random.c', - 'kern/subr_sbuf.c', - 'kern/subr_rman.c', - 'kern/subr_module.c', - 'libkern/inet_ntoa.c', - 'kern/kern_prot.c', - 'kern/kern_proc.c', - 'kern/kern_time.c', - 'kern/kern_event.c', - 'netinet/tcp_hostcache.c', - 'dev/pci/pci.c', - 'dev/pci/pci_user.c', - 'kern/uipc_accf.c', - 'kern/kern_ntptime.c', - 'kern/kern_environment.c', - 'kern/kern_intr.c', - 'kern/kern_resource.c', - 'kern/subr_bufring.c', - 'dev/led/led.c', - 'kern/subr_unit.c', - 'dev/pci/pci_pci.c', - 'netatalk/aarp.c', - 'netatalk/at_control.c', - 'netatalk/at_rmx.c', - 'netatalk/ddp_input.c', - 'netatalk/ddp_pcb.c', - 'netatalk/ddp_usrreq.c', - 'netatalk/at_proto.c', - 'netatalk/ddp_output.c', - 'kern/sys_generic.c', - 'kern/kern_descrip.c', - 'kern/kern_mtxpool.c', + 'sys/dev/random/harvest.c', + 'sys/netinet/tcp_hostcache.c', + 'sys/dev/led/led.c', + 'sys/netatalk/aarp.c', + 'sys/netatalk/at_control.c', + 'sys/netatalk/at_rmx.c', + 'sys/netatalk/ddp_input.c', + 'sys/netatalk/ddp_pcb.c', + 'sys/netatalk/ddp_usrreq.c', + 'sys/netatalk/at_proto.c', + 'sys/netatalk/ddp_output.c', ] ) devNic_re = Module('dev_nic_re') devNic_re.addHeaderFiles( [ - 'pci/if_rlreg.h', + 'sys/pci/if_rlreg.h', ] ) devNic_re.addSourceFiles( [ - 'dev/re/if_re.c', + 'sys/dev/re/if_re.c', ] ) devNic_fxp = Module('dev_nic_fxp') devNic_fxp.addHeaderFiles( [ - 'dev/fxp/if_fxpreg.h', - 'dev/fxp/if_fxpvar.h', - 'dev/fxp/rcvbundl.h', + 'sys/dev/fxp/if_fxpreg.h', + 'sys/dev/fxp/if_fxpvar.h', + 'sys/dev/fxp/rcvbundl.h', ] ) devNic_fxp.addSourceFiles( [ - 'dev/fxp/if_fxp.c', + 'sys/dev/fxp/if_fxp.c', ] ) devNic_e1000 = Module('dev_nic_e1000') devNic_e1000.addHeaderFiles( [ - 'dev/e1000/e1000_80003es2lan.h', - 'dev/e1000/e1000_82571.h', - 'dev/e1000/e1000_defines.h', - 'dev/e1000/e1000_mac.h', - 'dev/e1000/e1000_nvm.h', - 'dev/e1000/e1000_regs.h', - 'dev/e1000/if_igb.h', - 'dev/e1000/e1000_82541.h', - 'dev/e1000/e1000_82575.h', - 'dev/e1000/e1000_hw.h', - 'dev/e1000/e1000_manage.h', - 'dev/e1000/e1000_osdep.h', - 'dev/e1000/e1000_vf.h', - 'dev/e1000/if_lem.h', - 'dev/e1000/e1000_82543.h', - 'dev/e1000/e1000_api.h', - 'dev/e1000/e1000_ich8lan.h', - 'dev/e1000/e1000_mbx.h', - 'dev/e1000/e1000_phy.h', - 'dev/e1000/if_em.h', + 'sys/dev/e1000/e1000_80003es2lan.h', + 'sys/dev/e1000/e1000_82571.h', + 'sys/dev/e1000/e1000_defines.h', + 'sys/dev/e1000/e1000_mac.h', + 'sys/dev/e1000/e1000_nvm.h', + 'sys/dev/e1000/e1000_regs.h', + 'sys/dev/e1000/if_igb.h', + 'sys/dev/e1000/e1000_82541.h', + 'sys/dev/e1000/e1000_82575.h', + 'sys/dev/e1000/e1000_hw.h', + 'sys/dev/e1000/e1000_manage.h', + 'sys/dev/e1000/e1000_osdep.h', + 'sys/dev/e1000/e1000_vf.h', + 'sys/dev/e1000/if_lem.h', + 'sys/dev/e1000/e1000_82543.h', + 'sys/dev/e1000/e1000_api.h', + 'sys/dev/e1000/e1000_ich8lan.h', + 'sys/dev/e1000/e1000_mbx.h', + 'sys/dev/e1000/e1000_phy.h', + 'sys/dev/e1000/if_em.h', ] ) devNic_e1000.addSourceFiles( [ - 'dev/e1000/e1000_80003es2lan.c', - 'dev/e1000/e1000_82542.c', - 'dev/e1000/e1000_82575.c', - 'dev/e1000/e1000_mac.c', - 'dev/e1000/e1000_nvm.c', - 'dev/e1000/e1000_vf.c', - 'dev/e1000/if_lem.c', - 'dev/e1000/e1000_82540.c', - 'dev/e1000/e1000_82543.c', - 'dev/e1000/e1000_api.c', - 'dev/e1000/e1000_manage.c', - 'dev/e1000/e1000_osdep.c', - 'dev/e1000/if_em.c', - 'dev/e1000/e1000_82541.c', - 'dev/e1000/e1000_82571.c', - 'dev/e1000/e1000_ich8lan.c', - 'dev/e1000/e1000_mbx.c', - 'dev/e1000/e1000_phy.c', - 'dev/e1000/if_igb.c', + 'sys/dev/e1000/e1000_80003es2lan.c', + 'sys/dev/e1000/e1000_82542.c', + 'sys/dev/e1000/e1000_82575.c', + 'sys/dev/e1000/e1000_mac.c', + 'sys/dev/e1000/e1000_nvm.c', + 'sys/dev/e1000/e1000_vf.c', + 'sys/dev/e1000/if_lem.c', + 'sys/dev/e1000/e1000_82540.c', + 'sys/dev/e1000/e1000_82543.c', + 'sys/dev/e1000/e1000_api.c', + 'sys/dev/e1000/e1000_manage.c', + 'sys/dev/e1000/e1000_osdep.c', + 'sys/dev/e1000/if_em.c', + 'sys/dev/e1000/e1000_82541.c', + 'sys/dev/e1000/e1000_82571.c', + 'sys/dev/e1000/e1000_ich8lan.c', + 'sys/dev/e1000/e1000_mbx.c', + 'sys/dev/e1000/e1000_phy.c', + 'sys/dev/e1000/if_igb.c', ] ) @@ -1504,14 +1321,14 @@ devNic_e1000.addSourceFiles( devNic_dc = Module('dev_nic_dc') devNic_dc.addHeaderFiles( [ - 'dev/dc/if_dcreg.h', + 'sys/dev/dc/if_dcreg.h', ] ) devNic_dc.addSourceFiles( [ - 'dev/dc/dcphy.c', - 'dev/dc/if_dc.c', - 'dev/dc/pnphy.c', + 'sys/dev/dc/dcphy.c', + 'sys/dev/dc/if_dc.c', + 'sys/dev/dc/pnphy.c', ] ) @@ -1519,13 +1336,13 @@ devNic_dc.addSourceFiles( devNic_smc = Module('dev_nic_smc') devNic_smc.addHeaderFiles( [ - 'dev/smc/if_smcreg.h', - 'dev/smc/if_smcvar.h', + 'sys/dev/smc/if_smcreg.h', + 'sys/dev/smc/if_smcvar.h', ] ) devNic_smc.addSourceFiles( [ - 'dev/smc/if_smc.c', + 'sys/dev/smc/if_smc.c', ] ) @@ -1533,15 +1350,15 @@ devNic_smc.addSourceFiles( devNic_cs = Module('dev_nic_cs') devNic_cs.addHeaderFiles( [ - 'dev/cs/if_csreg.h', - 'dev/cs/if_csvar.h', + 'sys/dev/cs/if_csreg.h', + 'sys/dev/cs/if_csvar.h', ] ) devNic_cs.addSourceFiles( [ - 'dev/cs/if_cs.c', - 'dev/cs/if_cs_isa.c', - 'dev/cs/if_cs_pccard.c', + 'sys/dev/cs/if_cs.c', + 'sys/dev/cs/if_cs_isa.c', + 'sys/dev/cs/if_cs_pccard.c', ] ) @@ -1549,324 +1366,283 @@ devNic_cs.addSourceFiles( devNic_broadcomm = Module('dev_nic_broadcomm') devNic_broadcomm.addHeaderFiles( [ - 'dev/bce/if_bcefw.h', - 'dev/bce/if_bcereg.h', - 'dev/bfe/if_bfereg.h', - 'dev/bge/if_bgereg.h', + 'sys/dev/bce/if_bcefw.h', + 'sys/dev/bce/if_bcereg.h', + 'sys/dev/bfe/if_bfereg.h', + 'sys/dev/bge/if_bgereg.h', ] ) devNic_broadcomm.addSourceFiles( [ - 'dev/bce/if_bce.c', - 'dev/bfe/if_bfe.c', - 'dev/bge/if_bge.c', - ] -) - -netDeps = Module('netDeps') -netDeps.addHeaderFiles( - [ - 'security/mac/mac_framework.h', - 'sys/cpu.h', - 'sys/interrupt.h', - 'sys/fnv_hash.h', - 'sys/tree.h', - 'sys/buf_ring.h', - 'sys/rwlock.h', - 'sys/_rmlock.h', - 'sys/sockio.h', - 'sys/sdt.h', - 'sys/_task.h', - 'sys/sbuf.h', - 'sys/smp.h', - 'sys/syslog.h', - 'sys/jail.h', - 'sys/protosw.h', - 'sys/random.h', - 'sys/rmlock.h', - 'sys/hash.h', - #'sys/select.h', - 'sys/sf_buf.h', - 'sys/socketvar.h', - 'sys/sockbuf.h', - #'sys/sysproto.h', - 'sys/sockstate.h', - 'sys/sockopt.h', - 'sys/domain.h', - 'sys/time.h', + 'sys/dev/bce/if_bce.c', + 'sys/dev/bfe/if_bfe.c', + 'sys/dev/bge/if_bge.c', ] ) net = Module('net') net.addHeaderFiles( [ - 'net/bpf_buffer.h', - 'net/bpfdesc.h', - 'net/bpf.h', - 'net/bpf_jitter.h', - 'net/bpf_zerocopy.h', - 'net/bridgestp.h', - 'net/ethernet.h', - 'net/fddi.h', - 'net/firewire.h', - 'net/flowtable.h', - 'net/ieee8023ad_lacp.h', - 'net/if_arc.h', - 'net/if_arp.h', - 'net/if_atm.h', - 'net/if_bridgevar.h', - 'net/if_clone.h', - 'net/if_dl.h', - 'net/if_enc.h', - 'net/if_gif.h', - 'net/if_gre.h', - 'net/if.h', - 'net/if_lagg.h', - 'net/if_llatbl.h', - 'net/if_llc.h', - 'net/if_media.h', - 'net/if_mib.h', - 'net/if_sppp.h', - 'net/if_stf.h', - 'net/if_tap.h', - 'net/if_tapvar.h', - 'net/if_tun.h', - 'net/if_types.h', - 'net/if_var.h', - 'net/if_vlan_var.h', - 'net/iso88025.h', - 'net/netisr.h', - 'net/pfil.h', - 'net/pfkeyv2.h', - 'net/ppp_defs.h', - 'net/radix.h', - 'net/radix_mpath.h', - 'net/raw_cb.h', - 'net/route.h', - 'net/slcompress.h', - 'net/vnet.h', - 'net/zlib.h', - 'sys/timepps.h', - 'sys/timetc.h', - 'sys/timex.h', + 'sys/net/bpf_buffer.h', + 'sys/net/bpfdesc.h', + 'sys/net/bpf.h', + 'sys/net/bpf_jitter.h', + 'sys/net/bpf_zerocopy.h', + 'sys/net/bridgestp.h', + 'sys/net/ethernet.h', + 'sys/net/fddi.h', + 'sys/net/firewire.h', + 'sys/net/flowtable.h', + 'sys/net/ieee8023ad_lacp.h', + 'sys/net/if_arc.h', + 'sys/net/if_arp.h', + 'sys/net/if_atm.h', + 'sys/net/if_bridgevar.h', + 'sys/net/if_clone.h', + 'sys/net/if_dl.h', + 'sys/net/if_enc.h', + 'sys/net/if_gif.h', + 'sys/net/if_gre.h', + 'sys/net/if.h', + 'sys/net/if_lagg.h', + 'sys/net/if_llatbl.h', + 'sys/net/if_llc.h', + 'sys/net/if_media.h', + 'sys/net/if_mib.h', + 'sys/net/if_sppp.h', + 'sys/net/if_stf.h', + 'sys/net/if_tap.h', + 'sys/net/if_tapvar.h', + 'sys/net/if_tun.h', + 'sys/net/if_types.h', + 'sys/net/if_var.h', + 'sys/net/if_vlan_var.h', + 'sys/net/iso88025.h', + 'sys/net/netisr.h', + 'sys/net/pfil.h', + 'sys/net/pfkeyv2.h', + 'sys/net/ppp_defs.h', + 'sys/net/radix.h', + 'sys/net/radix_mpath.h', + 'sys/net/raw_cb.h', + 'sys/net/route.h', + 'sys/net/slcompress.h', + 'sys/net/vnet.h', + 'sys/net/zlib.h', ] ) net.addSourceFiles( [ - 'kern/subr_eventhandler.c', - 'kern/kern_subr.c', - 'kern/kern_tc.c', - 'libkern/fls.c', - 'net/bridgestp.c', - 'net/ieee8023ad_lacp.c', - 'net/if_atmsubr.c', - 'net/if.c', - 'net/if_clone.c', - 'net/if_dead.c', - 'net/if_disc.c', - 'net/if_edsc.c', - 'net/if_ef.c', - 'net/if_enc.c', - 'net/if_epair.c', - 'net/if_faith.c', - 'net/if_fddisubr.c', - 'net/if_fwsubr.c', - 'net/if_gif.c', - 'net/if_gre.c', - 'net/if_iso88025subr.c', - 'net/if_lagg.c', - 'net/if_llatbl.c', - 'net/if_loop.c', - 'net/if_media.c', - 'net/if_mib.c', - 'net/if_spppfr.c', - 'net/if_spppsubr.c', - 'net/if_tap.c', - 'net/if_tun.c', - 'net/if_vlan.c', - 'net/pfil.c', - 'net/radix.c', - 'net/radix_mpath.c', - 'net/raw_cb.c', - 'net/raw_usrreq.c', - 'net/route.c', - 'net/rtsock.c', - 'net/slcompress.c', - 'net/zlib.c', - 'net/bpf_buffer.c', - 'net/bpf.c', - 'net/bpf_filter.c', - 'net/bpf_jitter.c', - 'net/if_arcsubr.c', - 'net/if_bridge.c', - 'net/if_ethersubr.c', - 'net/netisr.c', + 'sys/net/bridgestp.c', + 'sys/net/ieee8023ad_lacp.c', + 'sys/net/if_atmsubr.c', + 'sys/net/if.c', + 'sys/net/if_clone.c', + 'sys/net/if_dead.c', + 'sys/net/if_disc.c', + 'sys/net/if_edsc.c', + 'sys/net/if_ef.c', + 'sys/net/if_enc.c', + 'sys/net/if_epair.c', + 'sys/net/if_faith.c', + 'sys/net/if_fddisubr.c', + 'sys/net/if_fwsubr.c', + 'sys/net/if_gif.c', + 'sys/net/if_gre.c', + 'sys/net/if_iso88025subr.c', + 'sys/net/if_lagg.c', + 'sys/net/if_llatbl.c', + 'sys/net/if_loop.c', + 'sys/net/if_media.c', + 'sys/net/if_mib.c', + 'sys/net/if_spppfr.c', + 'sys/net/if_spppsubr.c', + 'sys/net/if_tap.c', + 'sys/net/if_tun.c', + 'sys/net/if_vlan.c', + 'sys/net/pfil.c', + 'sys/net/radix.c', + 'sys/net/radix_mpath.c', + 'sys/net/raw_cb.c', + 'sys/net/raw_usrreq.c', + 'sys/net/route.c', + 'sys/net/rtsock.c', + 'sys/net/slcompress.c', + 'sys/net/zlib.c', + 'sys/net/bpf_buffer.c', + 'sys/net/bpf.c', + 'sys/net/bpf_filter.c', + 'sys/net/bpf_jitter.c', + 'sys/net/if_arcsubr.c', + 'sys/net/if_bridge.c', + 'sys/net/if_ethersubr.c', + 'sys/net/netisr.c', ] ) netinet = Module('netinet') netinet.addHeaderFiles( [ - 'netinet/icmp6.h', - 'netinet/icmp_var.h', - 'netinet/if_atm.h', - 'netinet/if_ether.h', - 'netinet/igmp.h', - 'netinet/igmp_var.h', - 'netinet/in_gif.h', - 'netinet/in.h', - 'netinet/in_pcb.h', - 'netinet/in_systm.h', - 'netinet/in_var.h', - 'netinet/ip6.h', - 'netinet/ip_carp.h', - 'netinet/ip_divert.h', - 'netinet/ip_dummynet.h', - 'netinet/ip_ecn.h', - 'netinet/ip_encap.h', - 'netinet/ip_fw.h', - 'netinet/ip_gre.h', - 'netinet/ip.h', - 'netinet/ip_icmp.h', - 'netinet/ip_ipsec.h', - 'netinet/ip_mroute.h', - 'netinet/ip_options.h', - 'netinet/ip_var.h', - 'netinet/ipfw/ip_dn_private.h', - 'netinet/ipfw/ip_fw_private.h', - 'netinet/ipfw/dn_sched.h', - 'netinet/ipfw/dn_heap.h', - 'netinet/pim.h', - 'netinet/pim_var.h', - 'netinet/sctp_asconf.h', - 'netinet/sctp_auth.h', - 'netinet/sctp_bsd_addr.h', - 'netinet/sctp_cc_functions.h', - 'netinet/sctp_constants.h', - 'netinet/sctp_crc32.h', - 'netinet/sctp.h', - 'netinet/sctp_header.h', - 'netinet/sctp_indata.h', - 'netinet/sctp_input.h', - 'netinet/sctp_lock_bsd.h', - 'netinet/sctp_os_bsd.h', - 'netinet/sctp_os.h', - 'netinet/sctp_output.h', - 'netinet/sctp_pcb.h', - 'netinet/sctp_peeloff.h', - 'netinet/sctp_structs.h', - 'netinet/sctp_sysctl.h', - 'netinet/sctp_timer.h', - 'netinet/sctp_uio.h', - 'netinet/sctputil.h', - 'netinet/sctp_var.h', - 'netinet/tcp_debug.h', - 'netinet/tcp_fsm.h', - 'netinet/tcp.h', - 'netinet/tcp_hostcache.h', - 'netinet/tcpip.h', - 'netinet/tcp_lro.h', - 'netinet/tcp_offload.h', - 'netinet/tcp_seq.h', - 'netinet/tcp_syncache.h', - 'netinet/tcp_timer.h', - 'netinet/tcp_var.h', - 'netinet/toedev.h', - 'netinet/udp.h', - 'netinet/udp_var.h', - 'netinet/libalias/alias_local.h', - 'netinet/libalias/alias.h', - 'netinet/libalias/alias_mod.h', - 'netinet/libalias/alias_sctp.h', + 'sys/netinet/icmp6.h', + 'sys/netinet/icmp_var.h', + 'sys/netinet/if_atm.h', + 'sys/netinet/if_ether.h', + 'sys/netinet/igmp.h', + 'sys/netinet/igmp_var.h', + 'sys/netinet/in_gif.h', + 'sys/netinet/in.h', + 'sys/netinet/in_pcb.h', + 'sys/netinet/in_systm.h', + 'sys/netinet/in_var.h', + 'sys/netinet/ip6.h', + 'sys/netinet/ip_carp.h', + 'sys/netinet/ip_divert.h', + 'sys/netinet/ip_dummynet.h', + 'sys/netinet/ip_ecn.h', + 'sys/netinet/ip_encap.h', + 'sys/netinet/ip_fw.h', + 'sys/netinet/ip_gre.h', + 'sys/netinet/ip.h', + 'sys/netinet/ip_icmp.h', + 'sys/netinet/ip_ipsec.h', + 'sys/netinet/ip_mroute.h', + 'sys/netinet/ip_options.h', + 'sys/netinet/ip_var.h', + 'sys/netinet/ipfw/ip_dn_private.h', + 'sys/netinet/ipfw/ip_fw_private.h', + 'sys/netinet/ipfw/dn_sched.h', + 'sys/netinet/ipfw/dn_heap.h', + 'sys/netinet/pim.h', + 'sys/netinet/pim_var.h', + 'sys/netinet/sctp_asconf.h', + 'sys/netinet/sctp_auth.h', + 'sys/netinet/sctp_bsd_addr.h', + 'sys/netinet/sctp_cc_functions.h', + 'sys/netinet/sctp_constants.h', + 'sys/netinet/sctp_crc32.h', + 'sys/netinet/sctp.h', + 'sys/netinet/sctp_header.h', + 'sys/netinet/sctp_indata.h', + 'sys/netinet/sctp_input.h', + 'sys/netinet/sctp_lock_bsd.h', + 'sys/netinet/sctp_os_bsd.h', + 'sys/netinet/sctp_os.h', + 'sys/netinet/sctp_output.h', + 'sys/netinet/sctp_pcb.h', + 'sys/netinet/sctp_peeloff.h', + 'sys/netinet/sctp_structs.h', + 'sys/netinet/sctp_sysctl.h', + 'sys/netinet/sctp_timer.h', + 'sys/netinet/sctp_uio.h', + 'sys/netinet/sctputil.h', + 'sys/netinet/sctp_var.h', + 'sys/netinet/tcp_debug.h', + 'sys/netinet/tcp_fsm.h', + 'sys/netinet/tcp.h', + 'sys/netinet/tcp_hostcache.h', + 'sys/netinet/tcpip.h', + 'sys/netinet/tcp_lro.h', + 'sys/netinet/tcp_offload.h', + 'sys/netinet/tcp_seq.h', + 'sys/netinet/tcp_syncache.h', + 'sys/netinet/tcp_timer.h', + 'sys/netinet/tcp_var.h', + 'sys/netinet/toedev.h', + 'sys/netinet/udp.h', + 'sys/netinet/udp_var.h', + 'sys/netinet/libalias/alias_local.h', + 'sys/netinet/libalias/alias.h', + 'sys/netinet/libalias/alias_mod.h', + 'sys/netinet/libalias/alias_sctp.h', ] ) # in_cksum.c is architecture dependent netinet.addSourceFiles( [ - 'netinet/accf_data.c', - 'netinet/accf_dns.c', - 'netinet/accf_http.c', - 'netinet/if_atm.c', - 'netinet/if_ether.c', - 'netinet/igmp.c', - 'netinet/in.c', - 'netinet/in_gif.c', - 'netinet/in_mcast.c', - 'netinet/in_pcb.c', - 'netinet/in_proto.c', - 'netinet/in_rmx.c', - 'netinet/ip_carp.c', - 'netinet/ip_divert.c', - 'netinet/ip_ecn.c', - 'netinet/ip_encap.c', - 'netinet/ip_fastfwd.c', - 'netinet/ip_gre.c', - 'netinet/ip_icmp.c', - 'netinet/ip_id.c', - 'netinet/ip_input.c', - 'netinet/ip_ipsec.c', - 'netinet/ip_mroute.c', - 'netinet/ip_options.c', - 'netinet/ip_output.c', - 'netinet/raw_ip.c', - 'netinet/sctp_asconf.c', - 'netinet/sctp_auth.c', - 'netinet/sctp_bsd_addr.c', - 'netinet/sctp_cc_functions.c', - 'netinet/sctp_crc32.c', - 'netinet/sctp_indata.c', - 'netinet/sctp_input.c', - 'netinet/sctp_output.c', - 'netinet/sctp_pcb.c', - 'netinet/sctp_peeloff.c', - 'netinet/sctp_sysctl.c', - 'netinet/sctp_timer.c', - 'netinet/sctp_usrreq.c', - 'netinet/sctputil.c', - 'netinet/tcp_debug.c', + 'sys/netinet/accf_data.c', + 'sys/netinet/accf_dns.c', + 'sys/netinet/accf_http.c', + 'sys/netinet/if_atm.c', + 'sys/netinet/if_ether.c', + 'sys/netinet/igmp.c', + 'sys/netinet/in.c', + 'sys/netinet/in_gif.c', + 'sys/netinet/in_mcast.c', + 'sys/netinet/in_pcb.c', + 'sys/netinet/in_proto.c', + 'sys/netinet/in_rmx.c', + 'sys/netinet/ip_carp.c', + 'sys/netinet/ip_divert.c', + 'sys/netinet/ip_ecn.c', + 'sys/netinet/ip_encap.c', + 'sys/netinet/ip_fastfwd.c', + 'sys/netinet/ip_gre.c', + 'sys/netinet/ip_icmp.c', + 'sys/netinet/ip_id.c', + 'sys/netinet/ip_input.c', + 'sys/netinet/ip_ipsec.c', + 'sys/netinet/ip_mroute.c', + 'sys/netinet/ip_options.c', + 'sys/netinet/ip_output.c', + 'sys/netinet/raw_ip.c', + 'sys/netinet/sctp_asconf.c', + 'sys/netinet/sctp_auth.c', + 'sys/netinet/sctp_bsd_addr.c', + 'sys/netinet/sctp_cc_functions.c', + 'sys/netinet/sctp_crc32.c', + 'sys/netinet/sctp_indata.c', + 'sys/netinet/sctp_input.c', + 'sys/netinet/sctp_output.c', + 'sys/netinet/sctp_pcb.c', + 'sys/netinet/sctp_peeloff.c', + 'sys/netinet/sctp_sysctl.c', + 'sys/netinet/sctp_timer.c', + 'sys/netinet/sctp_usrreq.c', + 'sys/netinet/sctputil.c', + 'sys/netinet/tcp_debug.c', #'netinet/tcp_hostcache.c', - 'netinet/tcp_input.c', - 'netinet/tcp_lro.c', - 'netinet/tcp_offload.c', - 'netinet/tcp_output.c', - 'netinet/tcp_reass.c', - 'netinet/tcp_sack.c', - 'netinet/tcp_subr.c', - 'netinet/tcp_syncache.c', - 'netinet/tcp_timer.c', - 'netinet/tcp_timewait.c', - 'netinet/tcp_usrreq.c', - 'netinet/udp_usrreq.c', - 'netinet/ipfw/dn_sched_fifo.c', - 'netinet/ipfw/dn_sched_rr.c', - 'netinet/ipfw/ip_fw_log.c', - 'netinet/ipfw/dn_sched_qfq.c', - 'netinet/ipfw/dn_sched_prio.c', + 'sys/netinet/tcp_input.c', + 'sys/netinet/tcp_lro.c', + 'sys/netinet/tcp_offload.c', + 'sys/netinet/tcp_output.c', + 'sys/netinet/tcp_reass.c', + 'sys/netinet/tcp_sack.c', + 'sys/netinet/tcp_subr.c', + 'sys/netinet/tcp_syncache.c', + 'sys/netinet/tcp_timer.c', + 'sys/netinet/tcp_timewait.c', + 'sys/netinet/tcp_usrreq.c', + 'sys/netinet/udp_usrreq.c', + 'sys/netinet/ipfw/dn_sched_fifo.c', + 'sys/netinet/ipfw/dn_sched_rr.c', + 'sys/netinet/ipfw/ip_fw_log.c', + 'sys/netinet/ipfw/dn_sched_qfq.c', + 'sys/netinet/ipfw/dn_sched_prio.c', #'netinet/ipfw/ip_fw_dynamic.c', - 'netinet/ipfw/ip_dn_glue.c', - 'netinet/ipfw/ip_fw2.c', - 'netinet/ipfw/dn_heap.c', - 'netinet/ipfw/ip_dummynet.c', - 'netinet/ipfw/ip_fw_sockopt.c', - 'netinet/ipfw/dn_sched_wf2q.c', - 'netinet/ipfw/ip_fw_nat.c', - 'netinet/ipfw/ip_fw_pfil.c', - 'netinet/ipfw/ip_dn_io.c', - 'netinet/ipfw/ip_fw_table.c', - 'netinet/libalias/alias_dummy.c', - 'netinet/libalias/alias_pptp.c', - 'netinet/libalias/alias_smedia.c', - 'netinet/libalias/alias_mod.c', - 'netinet/libalias/alias_cuseeme.c', - 'netinet/libalias/alias_nbt.c', - 'netinet/libalias/alias_irc.c', - 'netinet/libalias/alias_util.c', - 'netinet/libalias/alias_db.c', - 'netinet/libalias/alias_ftp.c', - 'netinet/libalias/alias_proxy.c', - 'netinet/libalias/alias.c', - 'netinet/libalias/alias_skinny.c', - 'netinet/libalias/alias_sctp.c', + 'sys/netinet/ipfw/ip_dn_glue.c', + 'sys/netinet/ipfw/ip_fw2.c', + 'sys/netinet/ipfw/dn_heap.c', + 'sys/netinet/ipfw/ip_dummynet.c', + 'sys/netinet/ipfw/ip_fw_sockopt.c', + 'sys/netinet/ipfw/dn_sched_wf2q.c', + 'sys/netinet/ipfw/ip_fw_nat.c', + 'sys/netinet/ipfw/ip_fw_pfil.c', + 'sys/netinet/ipfw/ip_dn_io.c', + 'sys/netinet/ipfw/ip_fw_table.c', + 'sys/netinet/libalias/alias_dummy.c', + 'sys/netinet/libalias/alias_pptp.c', + 'sys/netinet/libalias/alias_smedia.c', + 'sys/netinet/libalias/alias_mod.c', + 'sys/netinet/libalias/alias_cuseeme.c', + 'sys/netinet/libalias/alias_nbt.c', + 'sys/netinet/libalias/alias_irc.c', + 'sys/netinet/libalias/alias_util.c', + 'sys/netinet/libalias/alias_db.c', + 'sys/netinet/libalias/alias_ftp.c', + 'sys/netinet/libalias/alias_proxy.c', + 'sys/netinet/libalias/alias.c', + 'sys/netinet/libalias/alias_skinny.c', + 'sys/netinet/libalias/alias_sctp.c', ] ) @@ -1875,202 +1651,202 @@ netinet6.conditionalOn = "DISABLE_IPV6" netinet6.cppPattern = 's/^\#define INET6 1/\/\/ \#define INET6 1/' netinet6.addHeaderFiles( [ - 'netinet6/icmp6.h', - 'netinet6/in6_gif.h', - 'netinet6/in6.h', - 'netinet6/in6_ifattach.h', - 'netinet6/in6_pcb.h', - 'netinet6/in6_var.h', - 'netinet6/ip6_ecn.h', - 'netinet6/ip6.h', - 'netinet6/ip6_ipsec.h', - 'netinet6/ip6_mroute.h', - 'netinet6/ip6protosw.h', - 'netinet6/ip6_var.h', - 'netinet6/mld6.h', - 'netinet6/mld6_var.h', - 'netinet6/nd6.h', - 'netinet6/pim6.h', - 'netinet6/pim6_var.h', - 'netinet6/raw_ip6.h', - 'netinet6/scope6_var.h', - 'netinet6/sctp6_var.h', - 'netinet6/tcp6_var.h', - 'netinet6/udp6_var.h', + 'sys/netinet6/icmp6.h', + 'sys/netinet6/in6_gif.h', + 'sys/netinet6/in6.h', + 'sys/netinet6/in6_ifattach.h', + 'sys/netinet6/in6_pcb.h', + 'sys/netinet6/in6_var.h', + 'sys/netinet6/ip6_ecn.h', + 'sys/netinet6/ip6.h', + 'sys/netinet6/ip6_ipsec.h', + 'sys/netinet6/ip6_mroute.h', + 'sys/netinet6/ip6protosw.h', + 'sys/netinet6/ip6_var.h', + 'sys/netinet6/mld6.h', + 'sys/netinet6/mld6_var.h', + 'sys/netinet6/nd6.h', + 'sys/netinet6/pim6.h', + 'sys/netinet6/pim6_var.h', + 'sys/netinet6/raw_ip6.h', + 'sys/netinet6/scope6_var.h', + 'sys/netinet6/sctp6_var.h', + 'sys/netinet6/tcp6_var.h', + 'sys/netinet6/udp6_var.h', ] ) netinet6.addSourceFiles( [ - 'net/if_stf.c', - 'netinet6/dest6.c', - 'netinet6/frag6.c', - 'netinet6/icmp6.c', - 'netinet6/in6.c', - 'netinet6/in6_cksum.c', - 'netinet6/in6_gif.c', - 'netinet6/in6_ifattach.c', - 'netinet6/in6_mcast.c', - 'netinet6/in6_pcb.c', - 'netinet6/in6_proto.c', - 'netinet6/in6_rmx.c', - 'netinet6/in6_src.c', - 'netinet6/ip6_forward.c', - 'netinet6/ip6_id.c', - 'netinet6/ip6_input.c', - 'netinet6/ip6_ipsec.c', - 'netinet6/ip6_mroute.c', - 'netinet6/ip6_output.c', - 'netinet6/mld6.c', - 'netinet6/nd6.c', - 'netinet6/nd6_nbr.c', - 'netinet6/nd6_rtr.c', - 'netinet6/raw_ip6.c', - 'netinet6/route6.c', - 'netinet6/scope6.c', - 'netinet6/sctp6_usrreq.c', - 'netinet6/udp6_usrreq.c', + 'sys/net/if_stf.c', + 'sys/netinet6/dest6.c', + 'sys/netinet6/frag6.c', + 'sys/netinet6/icmp6.c', + 'sys/netinet6/in6.c', + 'sys/netinet6/in6_cksum.c', + 'sys/netinet6/in6_gif.c', + 'sys/netinet6/in6_ifattach.c', + 'sys/netinet6/in6_mcast.c', + 'sys/netinet6/in6_pcb.c', + 'sys/netinet6/in6_proto.c', + 'sys/netinet6/in6_rmx.c', + 'sys/netinet6/in6_src.c', + 'sys/netinet6/ip6_forward.c', + 'sys/netinet6/ip6_id.c', + 'sys/netinet6/ip6_input.c', + 'sys/netinet6/ip6_ipsec.c', + 'sys/netinet6/ip6_mroute.c', + 'sys/netinet6/ip6_output.c', + 'sys/netinet6/mld6.c', + 'sys/netinet6/nd6.c', + 'sys/netinet6/nd6_nbr.c', + 'sys/netinet6/nd6_rtr.c', + 'sys/netinet6/raw_ip6.c', + 'sys/netinet6/route6.c', + 'sys/netinet6/scope6.c', + 'sys/netinet6/sctp6_usrreq.c', + 'sys/netinet6/udp6_usrreq.c', ] ) netipsec = Module('netipsec') netipsec.addHeaderFiles( [ - 'netipsec/ah.h', - 'netipsec/ah_var.h', - 'netipsec/esp.h', - 'netipsec/esp_var.h', - 'netipsec/ipcomp.h', - 'netipsec/ipcomp_var.h', - 'netipsec/ipip_var.h', - 'netipsec/ipsec6.h', - 'netipsec/ipsec.h', - 'netipsec/keydb.h', - 'netipsec/key_debug.h', - 'netipsec/key.h', - 'netipsec/keysock.h', - 'netipsec/key_var.h', - 'netipsec/xform.h', + 'sys/netipsec/ah.h', + 'sys/netipsec/ah_var.h', + 'sys/netipsec/esp.h', + 'sys/netipsec/esp_var.h', + 'sys/netipsec/ipcomp.h', + 'sys/netipsec/ipcomp_var.h', + 'sys/netipsec/ipip_var.h', + 'sys/netipsec/ipsec6.h', + 'sys/netipsec/ipsec.h', + 'sys/netipsec/keydb.h', + 'sys/netipsec/key_debug.h', + 'sys/netipsec/key.h', + 'sys/netipsec/keysock.h', + 'sys/netipsec/key_var.h', + 'sys/netipsec/xform.h', ] ) netipsec.addSourceFiles( [ - 'netipsec/ipsec.c', - 'netipsec/ipsec_input.c', - 'netipsec/ipsec_mbuf.c', - 'netipsec/ipsec_output.c', - 'netipsec/key.c', - 'netipsec/key_debug.c', - 'netipsec/keysock.c', - 'netipsec/xform_ah.c', - 'netipsec/xform_esp.c', - 'netipsec/xform_ipcomp.c', - 'netipsec/xform_ipip.c', - 'netipsec/xform_tcp.c', + 'sys/netipsec/ipsec.c', + 'sys/netipsec/ipsec_input.c', + 'sys/netipsec/ipsec_mbuf.c', + 'sys/netipsec/ipsec_output.c', + 'sys/netipsec/key.c', + 'sys/netipsec/key_debug.c', + 'sys/netipsec/keysock.c', + 'sys/netipsec/xform_ah.c', + 'sys/netipsec/xform_esp.c', + 'sys/netipsec/xform_ipcomp.c', + 'sys/netipsec/xform_ipip.c', + 'sys/netipsec/xform_tcp.c', ] ) net80211 = Module('net80211') net80211.addHeaderFiles( [ - 'net80211/ieee80211_action.h', - 'net80211/ieee80211_adhoc.h', - 'net80211/ieee80211_ageq.h', - 'net80211/ieee80211_amrr.h', - 'net80211/ieee80211_crypto.h', - 'net80211/ieee80211_dfs.h', - 'net80211/ieee80211_freebsd.h', - 'net80211/_ieee80211.h', - 'net80211/ieee80211.h', - 'net80211/ieee80211_hostap.h', - 'net80211/ieee80211_ht.h', - 'net80211/ieee80211_input.h', - 'net80211/ieee80211_ioctl.h', - 'net80211/ieee80211_mesh.h', - 'net80211/ieee80211_monitor.h', - 'net80211/ieee80211_node.h', - 'net80211/ieee80211_phy.h', - 'net80211/ieee80211_power.h', - 'net80211/ieee80211_proto.h', - 'net80211/ieee80211_radiotap.h', - 'net80211/ieee80211_ratectl.h', - 'net80211/ieee80211_regdomain.h', - 'net80211/ieee80211_rssadapt.h', - 'net80211/ieee80211_scan.h', - 'net80211/ieee80211_sta.h', - 'net80211/ieee80211_superg.h', - 'net80211/ieee80211_tdma.h', - 'net80211/ieee80211_var.h', - 'net80211/ieee80211_wds.h', + 'sys/net80211/ieee80211_action.h', + 'sys/net80211/ieee80211_adhoc.h', + 'sys/net80211/ieee80211_ageq.h', + 'sys/net80211/ieee80211_amrr.h', + 'sys/net80211/ieee80211_crypto.h', + 'sys/net80211/ieee80211_dfs.h', + 'sys/net80211/ieee80211_freebsd.h', + 'sys/net80211/_ieee80211.h', + 'sys/net80211/ieee80211.h', + 'sys/net80211/ieee80211_hostap.h', + 'sys/net80211/ieee80211_ht.h', + 'sys/net80211/ieee80211_input.h', + 'sys/net80211/ieee80211_ioctl.h', + 'sys/net80211/ieee80211_mesh.h', + 'sys/net80211/ieee80211_monitor.h', + 'sys/net80211/ieee80211_node.h', + 'sys/net80211/ieee80211_phy.h', + 'sys/net80211/ieee80211_power.h', + 'sys/net80211/ieee80211_proto.h', + 'sys/net80211/ieee80211_radiotap.h', + 'sys/net80211/ieee80211_ratectl.h', + 'sys/net80211/ieee80211_regdomain.h', + 'sys/net80211/ieee80211_rssadapt.h', + 'sys/net80211/ieee80211_scan.h', + 'sys/net80211/ieee80211_sta.h', + 'sys/net80211/ieee80211_superg.h', + 'sys/net80211/ieee80211_tdma.h', + 'sys/net80211/ieee80211_var.h', + 'sys/net80211/ieee80211_wds.h', ] ) netipsec.addSourceFiles( [ - 'net80211/ieee80211_acl.c', - 'net80211/ieee80211_action.c', - 'net80211/ieee80211_adhoc.c', - 'net80211/ieee80211_ageq.c', - 'net80211/ieee80211_amrr.c', - 'net80211/ieee80211.c', - 'net80211/ieee80211_crypto.c', - 'net80211/ieee80211_crypto_ccmp.c', - 'net80211/ieee80211_crypto_none.c', - 'net80211/ieee80211_crypto_tkip.c', - 'net80211/ieee80211_crypto_wep.c', - 'net80211/ieee80211_ddb.c', - 'net80211/ieee80211_dfs.c', - 'net80211/ieee80211_freebsd.c', - 'net80211/ieee80211_hostap.c', - 'net80211/ieee80211_ht.c', - 'net80211/ieee80211_hwmp.c', - 'net80211/ieee80211_input.c', - 'net80211/ieee80211_ioctl.c', - 'net80211/ieee80211_mesh.c', - 'net80211/ieee80211_monitor.c', - 'net80211/ieee80211_node.c', - 'net80211/ieee80211_output.c', - 'net80211/ieee80211_phy.c', - 'net80211/ieee80211_power.c', - 'net80211/ieee80211_proto.c', - 'net80211/ieee80211_radiotap.c', - 'net80211/ieee80211_ratectl.c', - 'net80211/ieee80211_ratectl_none.c', - 'net80211/ieee80211_regdomain.c', - 'net80211/ieee80211_rssadapt.c', - 'net80211/ieee80211_scan.c', - 'net80211/ieee80211_scan_sta.c', - 'net80211/ieee80211_sta.c', - 'net80211/ieee80211_superg.c', - 'net80211/ieee80211_tdma.c', - 'net80211/ieee80211_wds.c', - 'net80211/ieee80211_xauth.c', + 'sys/net80211/ieee80211_acl.c', + 'sys/net80211/ieee80211_action.c', + 'sys/net80211/ieee80211_adhoc.c', + 'sys/net80211/ieee80211_ageq.c', + 'sys/net80211/ieee80211_amrr.c', + 'sys/net80211/ieee80211.c', + 'sys/net80211/ieee80211_crypto.c', + 'sys/net80211/ieee80211_crypto_ccmp.c', + 'sys/net80211/ieee80211_crypto_none.c', + 'sys/net80211/ieee80211_crypto_tkip.c', + 'sys/net80211/ieee80211_crypto_wep.c', + 'sys/net80211/ieee80211_ddb.c', + 'sys/net80211/ieee80211_dfs.c', + 'sys/net80211/ieee80211_freebsd.c', + 'sys/net80211/ieee80211_hostap.c', + 'sys/net80211/ieee80211_ht.c', + 'sys/net80211/ieee80211_hwmp.c', + 'sys/net80211/ieee80211_input.c', + 'sys/net80211/ieee80211_ioctl.c', + 'sys/net80211/ieee80211_mesh.c', + 'sys/net80211/ieee80211_monitor.c', + 'sys/net80211/ieee80211_node.c', + 'sys/net80211/ieee80211_output.c', + 'sys/net80211/ieee80211_phy.c', + 'sys/net80211/ieee80211_power.c', + 'sys/net80211/ieee80211_proto.c', + 'sys/net80211/ieee80211_radiotap.c', + 'sys/net80211/ieee80211_ratectl.c', + 'sys/net80211/ieee80211_ratectl_none.c', + 'sys/net80211/ieee80211_regdomain.c', + 'sys/net80211/ieee80211_rssadapt.c', + 'sys/net80211/ieee80211_scan.c', + 'sys/net80211/ieee80211_scan_sta.c', + 'sys/net80211/ieee80211_sta.c', + 'sys/net80211/ieee80211_superg.c', + 'sys/net80211/ieee80211_tdma.c', + 'sys/net80211/ieee80211_wds.c', + 'sys/net80211/ieee80211_xauth.c', ] ) opencrypto = Module('opencrypto') opencrypto.addHeaderFiles( [ - 'sys/md5.h', - 'opencrypto/deflate.h', - 'opencrypto/xform.h', - 'opencrypto/cryptosoft.h', - 'opencrypto/rmd160.h', - 'opencrypto/cryptodev.h', - 'opencrypto/castsb.h', - 'opencrypto/skipjack.h', - 'opencrypto/cast.h', + 'sys/sys/md5.h', + 'sys/opencrypto/deflate.h', + 'sys/opencrypto/xform.h', + 'sys/opencrypto/cryptosoft.h', + 'sys/opencrypto/rmd160.h', + 'sys/opencrypto/cryptodev.h', + 'sys/opencrypto/castsb.h', + 'sys/opencrypto/skipjack.h', + 'sys/opencrypto/cast.h', ] ) opencrypto.addSourceFiles( [ - 'opencrypto/crypto.c', - 'opencrypto/deflate.c', - 'opencrypto/cryptosoft.c', - 'opencrypto/criov.c', - 'opencrypto/rmd160.c', - 'opencrypto/xform.c', - 'opencrypto/skipjack.c', - 'opencrypto/cast.c', - 'opencrypto/cryptodev.c', + 'sys/opencrypto/crypto.c', + 'sys/opencrypto/deflate.c', + 'sys/opencrypto/cryptosoft.c', + 'sys/opencrypto/criov.c', + 'sys/opencrypto/rmd160.c', + 'sys/opencrypto/xform.c', + 'sys/opencrypto/skipjack.c', + 'sys/opencrypto/cast.c', + 'sys/opencrypto/cryptodev.c', ] ) @@ -2078,76 +1854,76 @@ crypto = Module('crypto') crypto.addHeaderFiles( [ #'crypto/aesni/aesni.h', - 'crypto/sha1.h', - 'crypto/sha2/sha2.h', - 'crypto/rijndael/rijndael.h', - 'crypto/rijndael/rijndael_local.h', - 'crypto/rijndael/rijndael-api-fst.h', - 'crypto/des/des.h', - 'crypto/des/spr.h', - 'crypto/des/podd.h', - 'crypto/des/sk.h', - 'crypto/des/des_locl.h', - 'crypto/blowfish/bf_pi.h', - 'crypto/blowfish/bf_locl.h', - 'crypto/blowfish/blowfish.h', - 'crypto/rc4/rc4.h', + 'sys/crypto/sha1.h', + 'sys/crypto/sha2/sha2.h', + 'sys/crypto/rijndael/rijndael.h', + 'sys/crypto/rijndael/rijndael_local.h', + 'sys/crypto/rijndael/rijndael-api-fst.h', + 'sys/crypto/des/des.h', + 'sys/crypto/des/spr.h', + 'sys/crypto/des/podd.h', + 'sys/crypto/des/sk.h', + 'sys/crypto/des/des_locl.h', + 'sys/crypto/blowfish/bf_pi.h', + 'sys/crypto/blowfish/bf_locl.h', + 'sys/crypto/blowfish/blowfish.h', + 'sys/crypto/rc4/rc4.h', #'crypto/via/padlock.h', - 'crypto/camellia/camellia.h', + 'sys/crypto/camellia/camellia.h', ] ) crypto.addSourceFiles( [ #'crypto/aesni/aesni.c', #'crypto/aesni/aesni_wrap.c', - 'crypto/sha1.c', - 'crypto/sha2/sha2.c', - 'crypto/rijndael/rijndael-alg-fst.c', - 'crypto/rijndael/rijndael-api.c', - 'crypto/rijndael/rijndael-api-fst.c', - 'crypto/des/des_setkey.c', - 'crypto/des/des_enc.c', - 'crypto/des/des_ecb.c', - 'crypto/blowfish/bf_enc.c', - 'crypto/blowfish/bf_skey.c', - 'crypto/blowfish/bf_ecb.c', - 'crypto/rc4/rc4.c', + 'sys/crypto/sha1.c', + 'sys/crypto/sha2/sha2.c', + 'sys/crypto/rijndael/rijndael-alg-fst.c', + 'sys/crypto/rijndael/rijndael-api.c', + 'sys/crypto/rijndael/rijndael-api-fst.c', + 'sys/crypto/des/des_setkey.c', + 'sys/crypto/des/des_enc.c', + 'sys/crypto/des/des_ecb.c', + 'sys/crypto/blowfish/bf_enc.c', + 'sys/crypto/blowfish/bf_skey.c', + 'sys/crypto/blowfish/bf_ecb.c', + 'sys/crypto/rc4/rc4.c', #'crypto/via/padlock.c', #'crypto/via/padlock_cipher.c', #'crypto/via/padlock_hash.c', - 'crypto/camellia/camellia-api.c', - 'crypto/camellia/camellia.c', + 'sys/crypto/camellia/camellia-api.c', + 'sys/crypto/camellia/camellia.c', ] ) altq = Module('altq') altq.addHeaderFiles( [ - 'contrib/altq/altq/altq_rmclass.h', - 'contrib/altq/altq/altq_cbq.h', - 'contrib/altq/altq/altq_var.h', - 'contrib/altq/altq/altqconf.h', - 'contrib/altq/altq/altq.h', - 'contrib/altq/altq/altq_hfsc.h', - 'contrib/altq/altq/altq_red.h', - 'contrib/altq/altq/altq_classq.h', - 'contrib/altq/altq/altq_priq.h', - 'contrib/altq/altq/altq_rmclass_debug.h', - 'contrib/altq/altq/altq_cdnr.h', - 'contrib/altq/altq/altq_rio.h', - 'contrib/altq/altq/if_altq.h', + 'sys/contrib/altq/altq/altq_rmclass.h', + 'sys/contrib/altq/altq/altq_cbq.h', + 'sys/contrib/altq/altq/altq_var.h', + 'sys/contrib/altq/altq/altqconf.h', + 'sys/contrib/altq/altq/altq.h', + 'sys/contrib/altq/altq/altq_hfsc.h', + 'sys/contrib/altq/altq/altq_red.h', + 'sys/contrib/altq/altq/altq_classq.h', + 'sys/contrib/altq/altq/altq_priq.h', + 'sys/contrib/altq/altq/altq_rmclass_debug.h', + 'sys/contrib/altq/altq/altq_cdnr.h', + 'sys/contrib/altq/altq/altq_rio.h', + 'sys/contrib/altq/altq/if_altq.h', ] ) altq.addSourceFiles( [ - 'contrib/altq/altq/altq_rmclass.c', - 'contrib/altq/altq/altq_rio.c', - 'contrib/altq/altq/altq_subr.c', - 'contrib/altq/altq/altq_cdnr.c', - 'contrib/altq/altq/altq_priq.c', - 'contrib/altq/altq/altq_cbq.c', - 'contrib/altq/altq/altq_hfsc.c', - 'contrib/altq/altq/altq_red.c', + 'sys/contrib/altq/altq/altq_rmclass.c', + 'sys/contrib/altq/altq/altq_rio.c', + 'sys/contrib/altq/altq/altq_subr.c', + 'sys/contrib/altq/altq/altq_cdnr.c', + 'sys/contrib/altq/altq/altq_priq.c', + 'sys/contrib/altq/altq/altq_cbq.c', + 'sys/contrib/altq/altq/altq_hfsc.c', + 'sys/contrib/altq/altq/altq_red.c', ] ) @@ -2155,25 +1931,369 @@ altq.addSourceFiles( pf = Module('pf') pf.addHeaderFiles( [ - 'contrib/pf/net/pf_mtag.h', - 'contrib/pf/net/if_pfsync.h', - 'contrib/pf/net/pfvar.h', - 'contrib/pf/net/if_pflog.h', + 'sys/contrib/pf/net/pf_mtag.h', + 'sys/contrib/pf/net/if_pfsync.h', + 'sys/contrib/pf/net/pfvar.h', + 'sys/contrib/pf/net/if_pflog.h', ] ) pf.addSourceFiles( [ - 'contrib/pf/netinet/in4_cksum.c', - 'contrib/pf/net/pf.c', - 'contrib/pf/net/if_pflog.c', - 'contrib/pf/net/pf_subr.c', - 'contrib/pf/net/pf_ioctl.c', - 'contrib/pf/net/pf_table.c', - 'contrib/pf/net/pf_if.c', - 'contrib/pf/net/pf_osfp.c', - 'contrib/pf/net/pf_norm.c', - 'contrib/pf/net/pf_ruleset.c', - 'contrib/pf/net/if_pfsync.c', + 'sys/contrib/pf/netinet/in4_cksum.c', + 'sys/contrib/pf/net/pf.c', + 'sys/contrib/pf/net/if_pflog.c', + 'sys/contrib/pf/net/pf_subr.c', + 'sys/contrib/pf/net/pf_ioctl.c', + 'sys/contrib/pf/net/pf_table.c', + 'sys/contrib/pf/net/pf_if.c', + 'sys/contrib/pf/net/pf_osfp.c', + 'sys/contrib/pf/net/pf_norm.c', + 'sys/contrib/pf/net/pf_ruleset.c', + 'sys/contrib/pf/net/if_pfsync.c', + ] +) + +pci = Module('pci') +pci.addSourceFiles( + [ + 'sys/dev/pci/pci.c', + 'sys/dev/pci/pci_user.c', + 'sys/dev/pci/pci_pci.c', + ] +) +pci.addHeaderFiles( + [ + 'sys/dev/pci/pcib_private.h', + 'sys/dev/pci/pci_private.h', + 'sys/dev/pci/pcireg.h', + 'sys/dev/pci/pcivar.h', + ] +) +pci.addCPUDependentHeaderFiles( + [ + 'sys/i386/include/legacyvar.h', + 'sys/i386/include/pci_cfgreg.h', + ] +) +pci.addTargetSourceCPUDependentHeaderFiles( + [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', 'mips', 'nios2', 'powerpc', 'sh', 'sparc', 'sparc64', 'v850' ], + 'i386', + [ + 'sys/i386/include/legacyvar.h', + 'sys/i386/include/pci_cfgreg.h', + ] +) +pci.addCPUDependentSourceFiles( + 'i386', + [ + 'sys/i386/pci/pci_bus.c', + 'sys/i386/i386/legacy.c', + ] +) +pci.addTargetSourceCPUDependentSourceFiles( + [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', 'mips', 'nios2', 'powerpc', 'sh', 'sparc', 'sparc64', 'v850' ], + 'i386', + [ + 'sys/i386/pci/pci_bus.c', + 'sys/i386/i386/legacy.c', + ] +) + +userSpace = Module('userSpace') +userSpace.addUserSpaceHeaderFiles( + [ + 'include/arpa/ftp.h', + 'include/arpa/inet.h', + 'include/arpa/nameser_compat.h', + 'include/arpa/nameser.h', + 'include/db.h', + 'include/err.h', + 'include/ifaddrs.h', + 'include/mpool.h', + 'include/netconfig.h', + 'include/netdb.h', + 'include/nlist.h', + 'include/nsswitch.h', + 'include/resolv.h', + 'include/res_update.h', + 'include/rpc/auth_des.h', + 'include/rpc/auth.h', + 'include/rpc/auth_unix.h', + 'include/rpc/clnt.h', + 'include/rpc/clnt_soc.h', + 'include/rpc/clnt_stat.h', + 'include/rpc/pmap_clnt.h', + 'include/rpc/pmap_prot.h', + 'include/rpc/rpcb_clnt.h', + 'include/rpc/rpcent.h', + 'include/rpc/rpc.h', + 'include/rpc/rpc_msg.h', + 'include/rpc/svc_auth.h', + 'include/rpc/svc.h', + 'include/rpcsvc/nis_db.h', + 'include/rpcsvc/nislib.h', + 'include/rpcsvc/nis_tags.h', + 'include/rpc/svc_soc.h', + 'include/rpcsvc/ypclnt.h', + 'include/rpcsvc/yp_prot.h', + 'include/rpc/xdr.h', + 'include/sysexits.h', + 'lib/libc/db/btree/btree.h', + 'lib/libc/db/btree/extern.h', + 'lib/libc/db/recno/extern.h', + 'lib/libc/db/recno/recno.h', + 'lib/libc/include/isc/eventlib.h', + 'lib/libc/include/isc/list.h', + 'lib/libc/include/isc/platform.h', + 'lib/libc/include/libc_private.h', + 'lib/libc/include/namespace.h', + 'lib/libc/include/nss_tls.h', + 'lib/libc/include/port_after.h', + 'lib/libc/include/port_before.h', + 'lib/libc/include/reentrant.h', + 'lib/libc/include/resolv_mt.h', + 'lib/libc/include/spinlock.h', + 'lib/libc/include/un-namespace.h', + 'lib/libc/isc/eventlib_p.h', + 'lib/libc/net/netdb_private.h', + 'lib/libc/net/nss_backends.h', + 'lib/libc/net/res_config.h', + 'lib/libc/resolv/res_debug.h', + 'lib/libc/resolv/res_private.h', + 'lib/libc/stdio/local.h', + 'lib/libipsec/ipsec_strerror.h', + 'lib/libipsec/libpfkey.h', + 'lib/libkvm/kvm.h', + 'lib/libmemstat/memstat.h', + 'lib/libmemstat/memstat_internal.h', + 'lib/libutil/libutil.h', + 'sbin/dhclient/dhcpd.h', + 'sbin/dhclient/dhcp.h', + 'sbin/dhclient/dhctoken.h', + 'sbin/dhclient/privsep.h', + 'sbin/dhclient/tree.h', + 'sbin/ifconfig/ifconfig.h', + 'sbin/ifconfig/regdomain.h', + 'usr.bin/netstat/netstat.h', + ] +) + +class RPCGENMakefileFragmentComposer(MakefileFragmentComposer): + def compose(self, path): + headerPath = path[:-2] + '.h' + return 'LIB_GEN_FILES += ' + headerPath + '\n' \ + + headerPath + ': ' + path + '\n' \ + '\t rm -f $@\n' \ + '\t rpcgen -h -o $@ $<\n' + +userSpace.addFile(File('include/rpc/rpcb_prot.x', PathComposer(), Converter(), Converter(), RPCGENMakefileFragmentComposer())) + +class RouteKeywordsMakefileFragmentComposer(MakefileFragmentComposer): + def compose(self, path): + headerPath = path + '.h' + tmpPath = path + '.tmp' + return 'LIB_GEN_FILES += ' + headerPath + '\n' \ + + headerPath + ': ' + path + '\n' \ + '\tsed -e \'/^#/d\' -e \'/^$$/d\' $< > ' + tmpPath + '\n' \ + '\tLC_ALL=C tr \'a-z\' \'A-Z\' < ' + tmpPath + ' | paste ' + tmpPath + ' - | \\\n' \ + '\tawk \'{ if (NF > 1) printf "#define\\tK_%s\\t%d\\n\\t{\\"%s\\", K_%s},\\n", $$2, NR, $$1, $$2 }\' > $@\n' \ + '\trm -f ' + tmpPath + '\n' + +userSpace.addFile(File('sbin/route/keywords', PathComposer(), Converter(), Converter(), RouteKeywordsMakefileFragmentComposer())) + +class LexMakefileFragmentComposer(MakefileFragmentComposer): + def __init__(self, sym, dep): + self.sym = sym + self.dep = dep + + def compose(self, path): + src = path[:-2] + '.c' + dep = path[:path.rfind('/')] + '/' + self.dep + return 'LIB_GEN_FILES += ' + src + '\n' \ + 'LIB_C_FILES += ' + src + '\n' \ + + src + ': ' + path + ' ' + dep + '\n' \ + '\t${LEX} -P ' + self.sym + ' -t $< | sed -e \'/YY_BUF_SIZE/s/16384/1024/\' > $@\n' + +class YaccMakefileFragmentComposer(MakefileFragmentComposer): + def __init__(self, sym, header): + self.sym = sym + self.header = header + + def compose(self, path): + src = path[:-2] + '.c' + hdr = path[:path.rfind('/')] + '/' + self.header + return 'LIB_GEN_FILES += ' + src + '\n' \ + 'LIB_C_FILES += ' + src + '\n' \ + + src + ': ' + path + '\n' \ + '\tyacc -b ' + self.sym + ' -d -p ' + self.sym + ' $<\n' \ + '\tsed -e ''/YY_BUF_SIZE/s/16384/1024/'' < ' + self.sym + '.tab.c > $@\n' \ + '\trm -f ' + self.sym + '.tab.c\n' \ + '\tmv ' + self.sym + '.tab.h ' + hdr + '\n' + +rtems.addFile(File('lib/libc/net/nslexer.l', PathComposer(), Converter(), Converter(), LexMakefileFragmentComposer('_nsyy', 'nsparser.c'))) +rtems.addFile(File('lib/libc/net/nsparser.y', PathComposer(), Converter(), Converter(), YaccMakefileFragmentComposer('_nsyy', 'nsparser.h'))) +rtems.addFile(File('lib/libipsec/policy_token.l', PathComposer(), Converter(), Converter(), LexMakefileFragmentComposer('__libipsecyy', 'policy_parse.c'))) +rtems.addFile(File('lib/libipsec/policy_parse.y', PathComposer(), Converter(), Converter(), YaccMakefileFragmentComposer('__libipsecyy', 'y.tab.h'))) + +userSpace.addUserSpaceSourceFiles( + [ + 'lib/libc/db/btree/bt_close.c', + 'lib/libc/db/btree/bt_conv.c', + 'lib/libc/db/btree/bt_debug.c', + 'lib/libc/db/btree/bt_delete.c', + 'lib/libc/db/btree/bt_get.c', + 'lib/libc/db/btree/bt_open.c', + 'lib/libc/db/btree/bt_overflow.c', + 'lib/libc/db/btree/bt_page.c', + 'lib/libc/db/btree/bt_put.c', + 'lib/libc/db/btree/bt_search.c', + 'lib/libc/db/btree/bt_seq.c', + 'lib/libc/db/btree/bt_split.c', + 'lib/libc/db/btree/bt_utils.c', + 'lib/libc/db/db/db.c', + 'lib/libc/db/mpool/mpool.c', + 'lib/libc/db/mpool/mpool-compat.c', + 'lib/libc/db/recno/rec_close.c', + 'lib/libc/db/recno/rec_delete.c', + 'lib/libc/db/recno/rec_get.c', + 'lib/libc/db/recno/rec_open.c', + 'lib/libc/db/recno/rec_put.c', + 'lib/libc/db/recno/rec_search.c', + 'lib/libc/db/recno/rec_seq.c', + 'lib/libc/db/recno/rec_utils.c', + 'lib/libc/gen/err.c', + 'lib/libc/gen/gethostname.c', + 'lib/libc/inet/inet_addr.c', + 'lib/libc/inet/inet_cidr_ntop.c', + 'lib/libc/inet/inet_cidr_pton.c', + 'lib/libc/inet/inet_lnaof.c', + 'lib/libc/inet/inet_makeaddr.c', + 'lib/libc/inet/inet_neta.c', + 'lib/libc/inet/inet_net_ntop.c', + 'lib/libc/inet/inet_netof.c', + 'lib/libc/inet/inet_net_pton.c', + 'lib/libc/inet/inet_network.c', + 'lib/libc/inet/inet_ntoa.c', + 'lib/libc/inet/inet_ntop.c', + 'lib/libc/inet/inet_pton.c', + 'lib/libc/inet/nsap_addr.c', + 'lib/libc/isc/ev_streams.c', + 'lib/libc/isc/ev_timers.c', + 'lib/libc/nameser/ns_name.c', + 'lib/libc/nameser/ns_netint.c', + 'lib/libc/nameser/ns_parse.c', + 'lib/libc/nameser/ns_print.c', + 'lib/libc/nameser/ns_samedomain.c', + 'lib/libc/nameser/ns_ttl.c', + 'lib/libc/net/base64.c', + 'lib/libc/net/ether_addr.c', + 'lib/libc/net/gai_strerror.c', + 'lib/libc/net/getaddrinfo.c', + 'lib/libc/net/gethostbydns.c', + 'lib/libc/net/gethostbyht.c', + 'lib/libc/net/gethostbynis.c', + 'lib/libc/net/gethostnamadr.c', + 'lib/libc/net/getifaddrs.c', + 'lib/libc/net/getifmaddrs.c', + 'lib/libc/net/getnameinfo.c', + 'lib/libc/net/getnetbydns.c', + 'lib/libc/net/getnetbyht.c', + 'lib/libc/net/getnetbynis.c', + 'lib/libc/net/getnetnamadr.c', + 'lib/libc/net/getproto.c', + 'lib/libc/net/getprotoent.c', + 'lib/libc/net/getprotoname.c', + 'lib/libc/net/getservent.c', + 'lib/libc/net/if_indextoname.c', + 'lib/libc/net/if_nameindex.c', + 'lib/libc/net/if_nametoindex.c', + 'lib/libc/net/linkaddr.c', + 'lib/libc/net/map_v4v6.c', + 'lib/libc/net/name6.c', + 'lib/libc/net/nsdispatch.c', + 'lib/libc/net/rcmd.c', + 'lib/libc/net/recv.c', + 'lib/libc/net/send.c', + 'lib/libc/resolv/h_errno.c', + 'lib/libc/resolv/herror.c', + 'lib/libc/resolv/mtctxres.c', + 'lib/libc/resolv/res_comp.c', + 'lib/libc/resolv/res_data.c', + 'lib/libc/resolv/res_debug.c', + 'lib/libc/resolv/res_findzonecut.c', + 'lib/libc/resolv/res_init.c', + 'lib/libc/resolv/res_mkquery.c', + 'lib/libc/resolv/res_mkupdate.c', + 'lib/libc/resolv/res_query.c', + 'lib/libc/resolv/res_send.c', + 'lib/libc/resolv/res_state.c', + 'lib/libc/resolv/res_update.c', + 'lib/libc/stdio/fgetln.c', + 'lib/libc/stdlib/strtonum.c', + 'lib/libc/string/strsep.c', + 'lib/libipsec/ipsec_dump_policy.c', + 'lib/libipsec/ipsec_get_policylen.c', + 'lib/libipsec/ipsec_strerror.c', + 'lib/libipsec/pfkey.c', + 'lib/libipsec/pfkey_dump.c', + 'lib/libmemstat/memstat_all.c', + 'lib/libmemstat/memstat.c', + 'lib/libmemstat/memstat_malloc.c', + 'lib/libmemstat/memstat_uma.c', + 'lib/libutil/expand_number.c', + 'lib/libutil/humanize_number.c', + 'lib/libutil/trimdomain.c', + 'sbin/dhclient/alloc.c', + 'sbin/dhclient/bpf.c', + 'sbin/dhclient/clparse.c', + 'sbin/dhclient/conflex.c', + 'sbin/dhclient/convert.c', + 'sbin/dhclient/dhclient.c', + 'sbin/dhclient/dispatch.c', + 'sbin/dhclient/errwarn.c', + 'sbin/dhclient/hash.c', + 'sbin/dhclient/inet.c', + 'sbin/dhclient/options.c', + 'sbin/dhclient/packet.c', + 'sbin/dhclient/parse.c', + 'sbin/dhclient/privsep.c', + 'sbin/dhclient/tables.c', + 'sbin/dhclient/tree.c', + 'sbin/ifconfig/af_atalk.c', + 'sbin/ifconfig/af_inet6.c', + 'sbin/ifconfig/af_inet.c', + 'sbin/ifconfig/af_link.c', + 'sbin/ifconfig/af_nd6.c', + 'sbin/ifconfig/ifbridge.c', + 'sbin/ifconfig/ifcarp.c', + 'sbin/ifconfig/ifclone.c', + 'sbin/ifconfig/ifconfig.c', + 'sbin/ifconfig/ifgif.c', + 'sbin/ifconfig/ifgre.c', + 'sbin/ifconfig/ifgroup.c', + 'sbin/ifconfig/ifieee80211.c', + 'sbin/ifconfig/iflagg.c', + 'sbin/ifconfig/ifmac.c', + 'sbin/ifconfig/ifmedia.c', + 'sbin/ifconfig/ifpfsync.c', + 'sbin/ifconfig/ifvlan.c', + 'sbin/ping6/ping6.c', + 'sbin/ping/ping.c', + 'sbin/route/route.c', + 'usr.bin/netstat/atalk.c', + 'usr.bin/netstat/bpf.c', + 'usr.bin/netstat/if.c', + 'usr.bin/netstat/inet6.c', + 'usr.bin/netstat/inet.c', + 'usr.bin/netstat/ipsec.c', + 'usr.bin/netstat/main.c', + 'usr.bin/netstat/mbuf.c', + 'usr.bin/netstat/mroute6.c', + 'usr.bin/netstat/mroute.c', + 'usr.bin/netstat/route.c', + 'usr.bin/netstat/pfkey.c', + 'usr.bin/netstat/sctp.c', + 'usr.bin/netstat/unix.c', ] ) @@ -2185,53 +2305,68 @@ in_cksum.addRTEMSHeaderFiles( ) in_cksum.addCPUDependentHeaderFiles( [ - 'arm/include/in_cksum.h', - 'i386/include/in_cksum.h', - 'mips/include/in_cksum.h', - 'powerpc/include/in_cksum.h', - 'sparc64/include/in_cksum.h', + 'sys/i386/include/in_cksum.h', + 'sys/mips/include/in_cksum.h', + 'sys/powerpc/include/in_cksum.h', + 'sys/sparc64/include/in_cksum.h', ] ) -in_cksum.addCPUDependentSourceFiles( - 'arm', +in_cksum.addTargetSourceCPUDependentHeaderFiles( + [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', 'nios2', 'sh', 'sparc', 'v850' ], + 'mips', + [ + 'sys/mips/include/in_cksum.h', + ] +) +in_cksum.addTargetSourceCPUDependentSourceFiles( + [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', 'nios2', 'sh', 'sparc', 'v850' ], + 'mips', [ - 'arm/arm/in_cksum.c', + 'sys/mips/mips/in_cksum.c', ] ) in_cksum.addCPUDependentSourceFiles( 'i386', [ - 'i386/i386/in_cksum.c', + 'sys/i386/i386/in_cksum.c', ] ) in_cksum.addCPUDependentSourceFiles( 'mips', [ - 'mips/mips/in_cksum.c', + 'sys/mips/mips/in_cksum.c', ] ) in_cksum.addCPUDependentSourceFiles( 'powerpc', [ - 'powerpc/powerpc/in_cksum.c', + 'sys/powerpc/powerpc/in_cksum.c', ] ) in_cksum.addCPUDependentSourceFiles( 'sparc', [ - 'mips/mips/in_cksum.c', + 'sys/mips/mips/in_cksum.c', ] ) in_cksum.addCPUDependentSourceFiles( 'sparc64', [ - 'sparc64/sparc64/in_cksum.c', + 'sys/sparc64/sparc64/in_cksum.c', ] ) +tests = Module('tests') +tests.addTest('usb01', ['init', 'test-file-system'], False) +tests.addTest('loopback01', ['test_main']) +tests.addTest('netshell01', ['test_main', 'shellconfig', 'ns_parser_vars']) +tests.addTest('swi01', ['init', 'swi_test']) +tests.addTest('timeout01', ['init', 'timeout_test', 'timeout_helper']) +tests.addTest('init01', ['test_main']) + # Register all the Module instances with the Module Manager mm.addModule(rtems) -mm.addModule(netDeps) +mm.addModule(base) mm.addModule(net) mm.addModule(netinet) mm.addModule(netinet6) @@ -2243,8 +2378,6 @@ mm.addModule(altq) mm.addModule(pf) mm.addModule(devNet) -mm.addModule(local) -mm.addModule(devUsbBase) mm.addModule(devUsb) mm.addModule(devUsbQuirk) mm.addModule(devUsbController) @@ -2254,7 +2387,7 @@ mm.addModule(devUsbStorage) #mm.addModule(devUsbNet) # Add PCI -mm.addModule(devPci) +mm.addModule(pci) # Add NIC devices mm.addModule(devNic) @@ -2270,16 +2403,20 @@ mm.addModule(devNic_broadcomm) # Add in_chksum mm.addModule(in_cksum) +mm.addModule(userSpace) + +mm.addModule(tests) + # XXX TODO Check that no file is also listed in empty # XXX TODO Check that no file in in two modules # Perform the actual file manipulation -if isForward == True: - if isOnlyMakefile == False: - mm.copyFromFreeBSDToRTEMS() - mm.createMakefile() +if isForward: + if not isOnlyMakefile: + mm.copyFromFreeBSDToRTEMS() + mm.createMakefile() else: - mm.copyFromRTEMSToFreeBSD() + mm.copyFromRTEMSToFreeBSD() # Print a summary if changing files if isDiffMode == False: -- cgit v1.2.3