USPi library merged into main kernel project

Author: maccasoft

Makefile

@@ -1,7 +1,6 @@
 
 all:
 	make -C kernel
-	make -C uspi
 	make -C zlib
 	make -C libpng
 	make -C libogg
@@ -15,7 +14,6 @@ all:
 
 clean:
 	make -C kernel -k clean
-	make -C uspi -k clean
 	make -C zlib -k clean
 	make -C libpng -k clean
 	make -C libogg -k clean

README

@@ -3,9 +3,9 @@ Raspberry Pi Baremetal
 This a code repository for bare-metal Raspberry Pi libraries and applications
 ports.
 
-   kernel     - Core startup and kernel code
+   kernel     - Core startup and kernel code, with USB support
+                provided by USPi library
 
-   uspi       - An USB driver for Raspberry Pi written in C
    libpng     - PNG image file format library
    libogg     - OGG file format library
    libvorbis  - OGG Vorbis audio decode library

SDL2/.cproject

@@ -52,7 +52,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="kernel;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
 	</storageModule>

SDL2/.project

@@ -3,7 +3,7 @@
 	<name>SDL2</name>
 	<comment></comment>
 	<projects>
-		<project>uspi</project>
+		<project>kernel</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

SDL2/Makefile

@@ -11,7 +11,7 @@ OBJCOPY := $(TOOLCHAIN)-objcopy
 DEPDIR := .deps
 
 ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
-CFLAGS = -O3 -Iinclude -Isrc -I../uspi/include -ffreestanding -fvisibility=hidden -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D_REENTRANT -D__RASPBERRY_PI__ -DHAVE_USPI
+CFLAGS = -O3 -Iinclude -Isrc -I../kernel -ffreestanding -fvisibility=hidden -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D_REENTRANT -D__RASPBERRY_PI__ -DHAVE_USPI
 CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
 
 all: libSDL2.a

SDL2/pkgconfig.mk

@@ -1,5 +1,7 @@
 
 CFLAGS += -I../SDL2/include
 
-LIBS += -L../SDL2 -lSDL2
+LDFLAGS += -L../SDL2
+
+LIBS := -lSDL2 $(LIBS)
 LIBS_DEP += ../SDL2/libSDL2.a

SDL2_image/pkgconfig.mk

@@ -1,5 +1,7 @@
 
 CFLAGS += -I../SDL2_image
 
-LIBS += -L../SDL2_image -lSDL2_image
+LDFLAGS += -L../SDL2_image
+
+LIBS := -lSDL2_image $(LIBS)
 LIBS_DEP += ../SDL2_image/libSDL2_image.a

SDL2_mixer/pkgconfig.mk

@@ -1,5 +1,7 @@
 
 CFLAGS += -I../SDL2_mixer
 
-LIBS += -L../SDL2_mixer -lSDL2_mixer
+LDFLAGS += -L../SDL2_mixer
+
+LIBS := -lSDL2_mixer $(LIBS)
 LIBS_DEP += ../SDL2_mixer/libSDL2_mixer.a

abbaye/.cproject

@@ -57,7 +57,6 @@
 				<externalSettings containerId="SDL2;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="SDL2_mixer;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="SDL2_image;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
 	</storageModule>

abbaye/.project

@@ -7,7 +7,6 @@
 		<project>SDL2_mixer</project>
 		<project>SDL2_image</project>
 		<project>kernel</project>
-		<project>uspi</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

abbaye/Makefile

@@ -3,16 +3,11 @@ all: kernel.img
 
 include ../kernel/common.mk
 
-include ../SDL2_image/pkgconfig.mk
-include ../SDL2_mixer/pkgconfig.mk
-include ../SDL2/pkgconfig.mk
-include ../uspi/pkgconfig.mk
 include ../libvorbis/pkgconfig.mk
 include ../libpng/pkgconfig.mk
-
-KOBJS = \
-	../kernel/start.o \
-	../kernel/syscalls.o
+include ../SDL2/pkgconfig.mk
+include ../SDL2_image/pkgconfig.mk
+include ../SDL2_mixer/pkgconfig.mk
 
 OBJS = \
 	data/enemies.o data/map.o \
@@ -30,8 +25,8 @@ CFLAGS += -finline-functions -funswitch-loops -fpredictive-commoning -fgcse-afte
 
 -include $(DEPDIR)/*.Po
 
-kernel.img: $(KOBJS) $(OBJS) Makefile ../kernel/raspberry.ld $(LIBS_DEP)
-	$(CXX) $(LDFLAGS) $(KOBJS) $(OBJS) $(LIBS)
+kernel.img: $(OBJS) Makefile ../kernel/raspberry.ld $(LIBS_DEP)
+	$(CXX) $(LDFLAGS) $(OBJS) $(LIBS)
 	$(OBJCOPY) kernel.elf -O binary kernel.img
 	rm kernel.elf
 

kernel/.cproject

@@ -25,7 +25,7 @@
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1958204956" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_USPI"/>
 								</option>
-								<option id="gnu.c.compiler.option.include.paths.461836132" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+								<option id="gnu.c.compiler.option.include.paths.461836132" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/uspi/include}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.460505247" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>

kernel/Makefile

@@ -1,22 +1,56 @@
 
 all: libkernel.a
 
+-include common.mk
+
 OBJS = \
+	start.o \
 	audio.o \
 	console.o \
 	emmc.o \
 	fb.o \
 	ff.o \
 	platform.o \
+	syscalls.o \
 	usb.o \
-	wiring.o \
+	wiring.o
+
+ifeq ($(USPI),1)
+OBJS += \
+	uspi/devicenameservice.o \
+	uspi/dwhcidevice.o \
+	uspi/dwhciframeschednper.o \
+	uspi/dwhciframeschednsplit.o \
+	uspi/dwhciframeschedper.o \
+	uspi/dwhciregister.o \
+	uspi/dwhcirootport.o \
+	uspi/dwhcixferstagedata.o \
+	uspi/keymap.o \
+	uspi/macaddress.o \
+	uspi/smsc951x.o \
+	uspi/string.o \
+	uspi/usbconfigparser.o \
+	uspi/usbdevice.o \
+	uspi/usbdevicefactory.o \
+	uspi/usbendpoint.o \
+	uspi/usbgamepad.o \
+	uspi/usbkeyboard.o \
+	uspi/usbmassdevice.o \
+	uspi/usbmouse.o \
+	uspi/usbrequest.o \
+	uspi/usbstandardhub.o \
+	uspi/usbstring.o \
+	uspi/uspilibrary.o \
+	uspi/util.o \
+	uspi/synchronize.o \
+	uspi/uspios.o
+endif
 
--include common.mk
 -include $(DEPDIR)/*.Po
 
 libkernel.a: $(OBJS) start.o syscalls.o Makefile raspberry.ld
 	$(AR) rcs -o $@ $(OBJS)
 
 clean:
-	rm -f $(OBJS) libkernel.a
+	rm -f $(OBJS) start.o syscalls.o libkernel.a
 	rm -rf $(DEPDIR)

kernel/common.mk

@@ -1,22 +1,28 @@
 
-TOOLCHAIN := arm-none-eabi
+TOOLCHAIN := arm-none-eabi-
 
-CC := $(TOOLCHAIN)-gcc
-CXX := $(TOOLCHAIN)-g++
-LD := $(TOOLCHAIN)-ld
-AS := $(TOOLCHAIN)-as
-AR := $(TOOLCHAIN)-ar
-OBJCOPY := $(TOOLCHAIN)-objcopy
+CC := $(TOOLCHAIN)gcc
+CXX := $(TOOLCHAIN)g++
+LD := $(TOOLCHAIN)ld
+AS := $(TOOLCHAIN)as
+AR := $(TOOLCHAIN)ar
+OBJCOPY := $(TOOLCHAIN)objcopy
 
 DEPDIR := .deps
+USPI := 1
 
 ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
-CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -fsigned-char -D__RASPBERRY_PI__ -DHAVE_USPI -I../kernel -I../uspi/include
+CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -fsigned-char -I../kernel -D__RASPBERRY_PI__
 CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
 LDFLAGS = -T ../kernel/raspberry.ld -nostartfiles -fno-exceptions -fno-unwind-tables -fno-rtti -Wl,-Map=kernel.map -o kernel.elf
 
-LIBS = -L../kernel -lkernel -L../uspi -luspi
-LIBS_DEP = ../kernel/libkernel.a ../uspi/libuspi.a
+ifeq ($(USPI),1)
+CFLAGS += -DHAVE_USPI
+endif
+
+LDFLAGS += -L../kernel
+LIBS += -lkernel
+LIBS_DEP += ../kernel/libkernel.a
 
 %.o: %.c
 	@mkdir -p $(DEPDIR)/$(@D)

kernel/raspberry.ld

@@ -1,5 +1,7 @@
 ENTRY(_start)
 
+STARTUP(start.o)
+
 SECTIONS
 {
     . = 0x8000;

uspi/include/uspi.h renamed to kernel/uspi.h

@@ -1,5 +1,7 @@
 
 CFLAGS += -I../libpng -I../zlib
 
-LIBS += -L../libpng -lpng -L../zlib -lz
+LDFLAGS += -L../libpng -L../zlib
+
+LIBS := -lpng -lz $(LIBS)
 LIBS_DEP += ../libpng/libpng.a ../zlib/libz.a

uspi/CREDITS renamed to kernel/uspi/CREDITS

@@ -1,5 +1,7 @@
 
 CFLAGS += -I../libvorbis/include -I../libogg/include
 
-LIBS += -L../libvorbis -L../libogg -lvorbis -logg
+LDFLAGS += -L../libvorbis -L../libogg
+
+LIBS := -lvorbis -logg $(LIBS)
 LIBS_DEP += ../libvorbis/libvorbis.a ../libogg/libogg.a

uspi/LICENSE renamed to kernel/uspi/LICENSE

@@ -59,7 +59,6 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
 				<externalSettings containerId="kernel;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
 	</storageModule>

uspi/lib/README renamed to kernel/uspi/README

@@ -4,7 +4,6 @@
 	<comment></comment>
 	<projects>
 		<project>kernel</project>
-		<project>uspi</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

uspi/README.md renamed to kernel/uspi/README.md

@@ -3,10 +3,7 @@ all: kernel.img
 
 include ../kernel/common.mk
 
-OBJS = \
-	../kernel/start.o \
-	../kernel/syscalls.o \
-	main.o
+OBJS = main.o
 
 -include $(DEPDIR)/*.Po
 
@@ -16,5 +13,5 @@ kernel.img: $(OBJS) Makefile ../kernel/raspberry.ld $(LIBS_DEP)
 	rm kernel.elf
 
 clean:
-	rm -f *.o kernel.elf kernel.img kernel.map
+	rm -f $(OBJS) kernel.elf kernel.img kernel.map
 	rm -rf $(DEPDIR)

uspi/include/uspi/assert.h renamed to kernel/uspi/assert.h

@@ -35,9 +35,6 @@
 
 #endif
 
-FATFS FatFs;
-FATFS USPiFatFs;
-
 #if defined(__cplusplus)
 extern "C" {
 #endif

uspi/include/uspi/bcm2835.h renamed to kernel/uspi/bcm2835.h

@@ -46,7 +46,6 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
 				<externalSettings containerId="SDL2;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
 	</storageModule>

uspi/lib/devicenameservice.c renamed to kernel/uspi/devicenameservice.c

@@ -4,7 +4,6 @@
 	<comment></comment>
 	<projects>
 		<project>SDL2</project>
-		<project>uspi</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

uspi/include/uspi/devicenameservice.h renamed to kernel/uspi/devicenameservice.h

@@ -4,10 +4,7 @@ all: kernel.img
 include ../kernel/common.mk
 include ../SDL2/pkgconfig.mk
 
-OBJS = \
-	../kernel/start.o \
-	../kernel/syscalls.o \
-	main.o
+OBJS = main.o
 
 -include $(DEPDIR)/*.Po
 
@@ -17,5 +14,5 @@ kernel.img: $(OBJS) Makefile ../kernel/raspberry.ld $(LIBS_DEP)
 	rm kernel.elf
 
 clean:
-	rm -f *.o kernel.elf kernel.img kernel.map
+	rm -f $(OBJS) kernel.elf kernel.img kernel.map
 	rm -rf $(DEPDIR)