Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ boot/arch/amd64/Makefile.inc (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -44,5 +44,5 @@ RD_SRVS = \ - $(USPACEDIR)/srv/pci/pci \ + $(USPACEDIR)/srv/dd/dd \ $(USPACEDIR)/srv/fb/fb \ $(USPACEDIR)/srv/kbd/kbd \ @@ -61,7 +61,8 @@ $(USPACEDIR)/app/tetris/tetris \ $(USPACEDIR)/app/tester/tester \ + $(USPACEDIR)/app/test_serial/test_serial \ $(USPACEDIR)/app/trace/trace \ $(USPACEDIR)/app/klog/klog \ - $(USPACEDIR)/app/bdsh/bdsh + $(USPACEDIR)/app/bdsh/bdsh build: $(BASE)/image.iso Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ uspace/Makefile (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -62,18 +62,15 @@ ifeq ($(UARCH),amd64) DIRS += \ - srv/pci \ - app/lspci + srv/dd endif ifeq ($(UARCH),ia32) DIRS += \ - srv/pci \ - app/lspci + srv/dd endif ifeq ($(UARCH),sparc64) DIRS += \ - srv/pci \ - app/lspci \ + srv/dd \ srv/cir/fhc \ srv/cir/obio Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ uspace/app/init/init.c (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -264,5 +264,5 @@ usleep(1000000); - spawn("/srv/pci"); + spawn("/srv/dd"); return 0; Index: uspace/app/shutters/Makefile =================================================================== --- uspace/app/shutters/Makefile (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ uspace/app/shutters/Makefile (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -1,39 +1,40 @@ -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# -include $(LIBC_PREFIX)/Makefile.toolchain +include Makefile.common -LIBS = $(LIBC_PREFIX)/libc.a +.PHONY: all clean -OUTPUT = shutters -SOURCES = shutters.c -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend disasm - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o - -disasm: $(OUTPUT).disasm - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< >$@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/test_serial/Makefile =================================================================== --- uspace/app/test_serial/Makefile (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ uspace/app/test_serial/Makefile (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -1,39 +1,40 @@ -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# -include $(LIBC_PREFIX)/Makefile.toolchain +include Makefile.common -LIBS = $(LIBC_PREFIX)/libc.a +.PHONY: all clean -OUTPUT = test_serial -SOURCES = test_serial.c -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend disasm - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o - -disasm: $(OUTPUT).disasm - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< >$@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/dd/Makefile =================================================================== --- uspace/srv/dd/Makefile (revision 1787e527c803ec9bf678df8b19b0de9e18985f12) +++ uspace/srv/dd/Makefile (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,66 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../libipc/include - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = pci -SOURCES = \ - main.c \ - pic.c \ - pci.c \ - intel_piix3.c \ - isa.c \ - serial.c - -ifeq ($(PROCESSOR), us) - SOURCES += psycho.c -endif - -ifeq ($(UARCH), ia32) - SOURCES += intel_method1.c -endif - -CFLAGS += -D$(UARCH) - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend disasm - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -disasm: $(OUTPUT).disasm - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< >$@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/dd/Makefile.build =================================================================== --- uspace/srv/dd/Makefile.build (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) +++ uspace/srv/dd/Makefile.build (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -0,0 +1,75 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + main.c \ + pic.c \ + pci.c \ + intel_piix3.c \ + isa.c \ + serial.c + +ifeq ($(PROCESSOR), us) + SOURCES += psycho.c +endif + +ifeq ($(UARCH), ia32) + SOURCES += intel_method1.c +endif + + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/dd/Makefile.common =================================================================== --- uspace/srv/dd/Makefile.common (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) +++ uspace/srv/dd/Makefile.common (revision 5ebdf945648f4756c104e9a4abf8f9011def8dcf) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = dd