From ebc9d6359bb270ceb65e18ade85a3de435584701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Czeka=C5=84ski?= <ja.czekanski@gmail.com>
Date: Tue, 22 May 2018 19:04:38 +0200
Subject: [PATCH] moved sources to src/ dir, clean with explicit defined files

---
 Makefile                                       |  16 +++++++++-------
 Makefile.rules                                 |   7 ++-----
 font                                           | Bin 4096 -> 0 bytes
 CBMFont.h => src/CBMFont.h                     |   0
 DiskCaddy.cpp => src/DiskCaddy.cpp             |   0
 DiskCaddy.h => src/DiskCaddy.h                 |   0
 DiskImage.cpp => src/DiskImage.cpp             |   0
 DiskImage.h => src/DiskImage.h                 |   0
 Drive.cpp => src/Drive.cpp                     |   0
 Drive.h => src/Drive.h                         |   0
 FileBrowser.cpp => src/FileBrowser.cpp         |   0
 FileBrowser.h => src/FileBrowser.h             |   0
 IOPort.h => src/IOPort.h                       |   0
 InputMappings.cpp => src/InputMappings.cpp     |   0
 InputMappings.h => src/InputMappings.h         |   0
 Keyboard.cpp => src/Keyboard.cpp               |   0
 Keyboard.h => src/Keyboard.h                   |   0
 Petscii.h => src/Petscii.h                     |   0
 Pi1541.cpp => src/Pi1541.cpp                   |   0
 Pi1541.h => src/Pi1541.h                       |   0
 ROMs.cpp => src/ROMs.cpp                       |   0
 ROMs.h => src/ROMs.h                           |   0
 Screen.cpp => src/Screen.cpp                   |   0
 Screen.h => src/Screen.h                       |   0
 Singleton.h => src/Singleton.h                 |   0
 Timer.c => src/Timer.c                         |   0
 Timer.h => src/Timer.h                         |   0
 armc-cppstubs.cpp => src/armc-cppstubs.cpp     |   0
 armc-cstartup.c => src/armc-cstartup.c         |   0
 armc-cstubs.c => src/armc-cstubs.c             |   0
 armc-start.S => src/armc-start.S               |   0
 bcm2835int.h => src/bcm2835int.h               |   0
 cache.c => src/cache.c                         |   0
 cache.h => src/cache.h                         |   0
 debug.h => src/debug.h                         |   0
 defs.h => src/defs.h                           |   0
 diskio.cpp => src/diskio.cpp                   |   0
 diskio.h => src/diskio.h                       |   0
 emmc.cpp => src/emmc.cpp                       |   0
 emmc.h => src/emmc.h                           |   0
 exception.c => src/exception.c                 |   0
 ff.cpp => src/ff.cpp                           |   0
 ff.h => src/ff.h                               |   0
 ffconf.h => src/ffconf.h                       |   0
 gcr.cpp => src/gcr.cpp                         |   0
 gcr.h => src/gcr.h                             |   0
 iec_bus.cpp => src/iec_bus.cpp                 |   0
 iec_bus.h => src/iec_bus.h                     |   0
 iec_commands.cpp => src/iec_commands.cpp       |   0
 iec_commands.h => src/iec_commands.h           |   0
 integer.h => src/integer.h                     |   0
 interrupt.c => src/interrupt.c                 |   0
 interrupt.h => src/interrupt.h                 |   0
 kernel.h => src/kernel.h                       |   0
 logo.h => src/logo.h                           |   0
 lz.c => src/lz.c                               |   0
 lz.h => src/lz.h                               |   0
 m6502.cpp => src/m6502.cpp                     |   0
 m6502.h => src/m6502.h                         |   0
 m6522.cpp => src/m6522.cpp                     |   0
 m6522.h => src/m6522.h                         |   0
 main.cpp => src/main.cpp                       |   0
 options.cpp => src/options.cpp                 |   0
 options.h => src/options.h                     |   0
 prot.cpp => src/prot.cpp                       |   0
 prot.h => src/prot.h                           |   0
 rpi-aux.c => src/rpi-aux.c                     |   0
 rpi-aux.h => src/rpi-aux.h                     |   0
 rpi-base.h => src/rpi-base.h                   |   0
 rpi-gpio.c => src/rpi-gpio.c                   |   0
 rpi-gpio.h => src/rpi-gpio.h                   |   0
 rpi-interrupts.c => src/rpi-interrupts.c       |   0
 rpi-interrupts.h => src/rpi-interrupts.h       |   0
 .../rpi-mailbox-interface.c                    |   0
 .../rpi-mailbox-interface.h                    |   0
 rpi-mailbox.c => src/rpi-mailbox.c             |   0
 rpi-mailbox.h => src/rpi-mailbox.h             |   0
 rpiHardware.h => src/rpiHardware.h             |   0
 sample.h => src/sample.h                       |   0
 startup.h => src/startup.h                     |   0
 stb_image.h => src/stb_image.h                 |   0
 stb_image_config.h => src/stb_image_config.h   |   0
 types.h => src/types.h                         |   0
 xga_font_data.c => src/xga_font_data.c         |   0
 xga_font_data.h => src/xga_font_data.h         |   0
 uspi/{lib => }/Makefile                        |  17 ++++++++++++-----
 86 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 font
 rename CBMFont.h => src/CBMFont.h (100%)
 rename DiskCaddy.cpp => src/DiskCaddy.cpp (100%)
 rename DiskCaddy.h => src/DiskCaddy.h (100%)
 rename DiskImage.cpp => src/DiskImage.cpp (100%)
 rename DiskImage.h => src/DiskImage.h (100%)
 rename Drive.cpp => src/Drive.cpp (100%)
 rename Drive.h => src/Drive.h (100%)
 rename FileBrowser.cpp => src/FileBrowser.cpp (100%)
 rename FileBrowser.h => src/FileBrowser.h (100%)
 rename IOPort.h => src/IOPort.h (100%)
 rename InputMappings.cpp => src/InputMappings.cpp (100%)
 rename InputMappings.h => src/InputMappings.h (100%)
 rename Keyboard.cpp => src/Keyboard.cpp (100%)
 rename Keyboard.h => src/Keyboard.h (100%)
 rename Petscii.h => src/Petscii.h (100%)
 rename Pi1541.cpp => src/Pi1541.cpp (100%)
 rename Pi1541.h => src/Pi1541.h (100%)
 rename ROMs.cpp => src/ROMs.cpp (100%)
 rename ROMs.h => src/ROMs.h (100%)
 rename Screen.cpp => src/Screen.cpp (100%)
 rename Screen.h => src/Screen.h (100%)
 rename Singleton.h => src/Singleton.h (100%)
 rename Timer.c => src/Timer.c (100%)
 rename Timer.h => src/Timer.h (100%)
 rename armc-cppstubs.cpp => src/armc-cppstubs.cpp (100%)
 rename armc-cstartup.c => src/armc-cstartup.c (100%)
 rename armc-cstubs.c => src/armc-cstubs.c (100%)
 rename armc-start.S => src/armc-start.S (100%)
 rename bcm2835int.h => src/bcm2835int.h (100%)
 rename cache.c => src/cache.c (100%)
 rename cache.h => src/cache.h (100%)
 rename debug.h => src/debug.h (100%)
 rename defs.h => src/defs.h (100%)
 rename diskio.cpp => src/diskio.cpp (100%)
 rename diskio.h => src/diskio.h (100%)
 rename emmc.cpp => src/emmc.cpp (100%)
 rename emmc.h => src/emmc.h (100%)
 rename exception.c => src/exception.c (100%)
 rename ff.cpp => src/ff.cpp (100%)
 rename ff.h => src/ff.h (100%)
 rename ffconf.h => src/ffconf.h (100%)
 rename gcr.cpp => src/gcr.cpp (100%)
 rename gcr.h => src/gcr.h (100%)
 rename iec_bus.cpp => src/iec_bus.cpp (100%)
 rename iec_bus.h => src/iec_bus.h (100%)
 rename iec_commands.cpp => src/iec_commands.cpp (100%)
 rename iec_commands.h => src/iec_commands.h (100%)
 rename integer.h => src/integer.h (100%)
 rename interrupt.c => src/interrupt.c (100%)
 rename interrupt.h => src/interrupt.h (100%)
 rename kernel.h => src/kernel.h (100%)
 rename logo.h => src/logo.h (100%)
 rename lz.c => src/lz.c (100%)
 rename lz.h => src/lz.h (100%)
 rename m6502.cpp => src/m6502.cpp (100%)
 rename m6502.h => src/m6502.h (100%)
 rename m6522.cpp => src/m6522.cpp (100%)
 rename m6522.h => src/m6522.h (100%)
 rename main.cpp => src/main.cpp (100%)
 rename options.cpp => src/options.cpp (100%)
 rename options.h => src/options.h (100%)
 rename prot.cpp => src/prot.cpp (100%)
 rename prot.h => src/prot.h (100%)
 rename rpi-aux.c => src/rpi-aux.c (100%)
 rename rpi-aux.h => src/rpi-aux.h (100%)
 rename rpi-base.h => src/rpi-base.h (100%)
 rename rpi-gpio.c => src/rpi-gpio.c (100%)
 rename rpi-gpio.h => src/rpi-gpio.h (100%)
 rename rpi-interrupts.c => src/rpi-interrupts.c (100%)
 rename rpi-interrupts.h => src/rpi-interrupts.h (100%)
 rename rpi-mailbox-interface.c => src/rpi-mailbox-interface.c (100%)
 rename rpi-mailbox-interface.h => src/rpi-mailbox-interface.h (100%)
 rename rpi-mailbox.c => src/rpi-mailbox.c (100%)
 rename rpi-mailbox.h => src/rpi-mailbox.h (100%)
 rename rpiHardware.h => src/rpiHardware.h (100%)
 rename sample.h => src/sample.h (100%)
 rename startup.h => src/startup.h (100%)
 rename stb_image.h => src/stb_image.h (100%)
 rename stb_image_config.h => src/stb_image_config.h (100%)
 rename types.h => src/types.h (100%)
 rename xga_font_data.c => src/xga_font_data.c (100%)
 rename xga_font_data.h => src/xga_font_data.h (100%)
 rename uspi/{lib => }/Makefile (84%)

diff --git a/Makefile b/Makefile
index 942c831..152051a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,10 @@ OBJS	= armc-start.o armc-cstartup.o armc-cstubs.o armc-cppstubs.o \
 	Drive.o gcr.o prot.o lz.o emmc.o diskio.o options.o Screen.o \
 	Timer.o FileBrowser.o DiskCaddy.o ROMs.o InputMappings.o xga_font_data.o
 
-LIBS    = uspi/lib/libuspi.a
+SRCDIR   = src
+OBJS    := $(addprefix $(SRCDIR)/, $(OBJS))
+
+LIBS     = uspi/libuspi.a
 INCLUDE  = -Iuspi/include/
 
 TARGET  ?= kernel
@@ -20,12 +23,11 @@ $(TARGET): $(OBJS) $(LIBS)
 	$(Q)$(PREFIX)objdump -d $(TARGET).elf | $(PREFIX)c++filt > $(TARGET).lst
 	$(Q)$(PREFIX)objcopy $(TARGET).elf -O binary $(TARGET).img
 
-uspi/lib/libuspi.a:
-	$(MAKE) -C uspi/lib
+uspi/libuspi.a:
+	$(MAKE) -C uspi
 
-clean: clean_libs
-
-clean_libs:
-	$(MAKE) -C uspi/lib clean
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).elf $(TARGET).map $(TARGET).lst $(TARGET).img
+	$(MAKE) -C uspi clean
 
 include Makefile.rules
\ No newline at end of file
diff --git a/Makefile.rules b/Makefile.rules
index 1527e09..241686e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1,4 +1,4 @@
-# To show build commands: make
+# To show build commands: make V=1
 ifneq ($(V),1)
 Q		:= @
 endif
@@ -45,7 +45,4 @@ CFLAGS	 += -fno-delete-null-pointer-checks -fdata-sections -ffunction-sections -
 
 %.o: %.cpp
 	@echo "  CPP  $@"
-	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.elf *.lst *.img *.map
\ No newline at end of file
+	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<
\ No newline at end of file
diff --git a/font b/font
deleted file mode 100644
index 191ac46020700b54be928ced7772b053d794fa72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmeHJJ&PMj5N#tEIS`V$XaZsV1;N6ippmls9l{HJftO{Y^#;p)u)*5VvaEw^Sfk%@
znM4O-L7=}NqhO-L5(=yV;lB5(XKZsA?95>Nq?w+o>aKcS)7>@NoSltdXccRd7-Q6x
zG5jlS#^bTk>hcuY(@T|%$Cu-AQnh2+&kXFa$~YYpT0L(8rvrsC=NPNt1xVD%tMui`
z$%!%-NrHhGPiTpU4nfv!kvR_jbp(4Neq+Xw{-KE#e7#Ix!JpBfZfGY3l|-$$k9fLI
zXw~|of7O3+P@242T4AE%Qa$UZY5$q3!7wn=kEo3C_!$)s!Q(1cFAV&eKfy~6{xTzl
zFwzg&em`z0TrE5+Wwh6H5yyyAd5>vONhQ&yR6~fu-`NH85XS>B0B;kugujWpoPX4Q
zZqg`1-mfCc$P3;N@&Z1jjJfmAc1Sztz<+4tejC~7$8E@XcetO&Ed)N7IC1FcJ@ikz
z!!+#<!6N`F(f_}JUJR06+$62ILA}}xIJVnqLcn}BE3{LA_tVw+pxbUX8qIchaK4&C
zQ&}1Ur4xYs0YpAd({$K<s<?UxXq%mG9J?aXIw>6bW92b##&F$56*v!$0}=0Wn@;<E
zUSvif@xzPbW98FPuhVQiVK`z_fzO`c!xvO+r_;sa=!jQf-Dt22W&i20->jxttw*R{
zPvR-n0Ynb|_WMd-<yQJZRmT+GkfmS9(sa72(5&#K^H)qkJH!uGPKmJ@R{Wu*j&f~t
z_U>+CoiCitt+oEzTK>JWlL_@V_t4(o_<S<CnN0GkozQ+~VTV=5xq@*1{SLUFdyKio
zSPw5i?jK%fZyz2WynU1B7>MzNlX&P5WVaQW<KW+wu;=2pU>xZmn!>}^+w3*`SqJKt
zc2e+pxhs~4=az)?yMLG0%Xba$$ZO|3CMqudhh>&6Kk!Wp7zRfA5!qUWpY_EIJgy7>
z&cd(#2fW<;Z#(q}BmJOVE{mPVwZpUb)+t99MS(cdh0iefypkw;e-NVZclU;QD2h24
zfVVAo!rzu_&cEEgw^>;t@7E<|<OS~sc>y0%#@zX5JENU*;6Jp*a*J#%i!EflJKS%J
z9RlA<oFa6T1^;n9%d+(hJOa@5^G3k)XQ_Ua^x`II#SQviXU?(f%^m{g)9Ild36vW3
zZs+Um{&3iD*Yn%n2%5@r5O|jZ<PRY7W0qyJ^+(UuLqNOVtcya&xpR4}(H|?1d9#-5
zuB^a$a2$vzh1+PfT=F6_0*Rl!d3^LLo31wd!zYF#xK9W^bAN<GfRdnMI~s-EzgPs;
zhXbwDsV9wQr#DJ#JwmNk63=_?HIaj_X0y^)NtJ$3)iH%PWa$^OG#d3P>??ff{1sEs
z4)KGP^I>d;6@O^!Io3ARAF2OJ>1b$%N{v}xuHZ@I)WvxmK}|g>MnbtA4{?@2raHO`
z{Za5@HQ+g{A~}jR^rx)j)QVo26kh-s2lrBAQL&_6F&xi#@fXpK!1T|;3%@MatX~{P
z9vsH_sQ<%b%KQKb`eEx5bq;0tcm3xJ!J+@d_5WA<{==gAX8o`C?~z>?URXE+?h}H7
zY}25w@87Ne3wvaE{p|Yxq!HoEdn~*;AMSGs$j5$<ww_~ctLwk_uAJGK_Y>BaYox&8
z)WvyRLQOp?MoxKK%);?Sb$K27qu>>O&U4t8auhr0?^(yG6}`6^z5w6{?xn_}VoAMX
zIG*p~ucRG;(N795{IXoLesLIia2N|5>i_JKGCu%<ezv<ookJP^UH|z)aOnSV{r}az
z|FCGjS^w+r_ptkqxNrpACj<rAJV9OGzgz#q?qArSUH?BFN_=@wgg58IeNF-SXg1N-
IbF6Lu0d}$YVgLXD

diff --git a/CBMFont.h b/src/CBMFont.h
similarity index 100%
rename from CBMFont.h
rename to src/CBMFont.h
diff --git a/DiskCaddy.cpp b/src/DiskCaddy.cpp
similarity index 100%
rename from DiskCaddy.cpp
rename to src/DiskCaddy.cpp
diff --git a/DiskCaddy.h b/src/DiskCaddy.h
similarity index 100%
rename from DiskCaddy.h
rename to src/DiskCaddy.h
diff --git a/DiskImage.cpp b/src/DiskImage.cpp
similarity index 100%
rename from DiskImage.cpp
rename to src/DiskImage.cpp
diff --git a/DiskImage.h b/src/DiskImage.h
similarity index 100%
rename from DiskImage.h
rename to src/DiskImage.h
diff --git a/Drive.cpp b/src/Drive.cpp
similarity index 100%
rename from Drive.cpp
rename to src/Drive.cpp
diff --git a/Drive.h b/src/Drive.h
similarity index 100%
rename from Drive.h
rename to src/Drive.h
diff --git a/FileBrowser.cpp b/src/FileBrowser.cpp
similarity index 100%
rename from FileBrowser.cpp
rename to src/FileBrowser.cpp
diff --git a/FileBrowser.h b/src/FileBrowser.h
similarity index 100%
rename from FileBrowser.h
rename to src/FileBrowser.h
diff --git a/IOPort.h b/src/IOPort.h
similarity index 100%
rename from IOPort.h
rename to src/IOPort.h
diff --git a/InputMappings.cpp b/src/InputMappings.cpp
similarity index 100%
rename from InputMappings.cpp
rename to src/InputMappings.cpp
diff --git a/InputMappings.h b/src/InputMappings.h
similarity index 100%
rename from InputMappings.h
rename to src/InputMappings.h
diff --git a/Keyboard.cpp b/src/Keyboard.cpp
similarity index 100%
rename from Keyboard.cpp
rename to src/Keyboard.cpp
diff --git a/Keyboard.h b/src/Keyboard.h
similarity index 100%
rename from Keyboard.h
rename to src/Keyboard.h
diff --git a/Petscii.h b/src/Petscii.h
similarity index 100%
rename from Petscii.h
rename to src/Petscii.h
diff --git a/Pi1541.cpp b/src/Pi1541.cpp
similarity index 100%
rename from Pi1541.cpp
rename to src/Pi1541.cpp
diff --git a/Pi1541.h b/src/Pi1541.h
similarity index 100%
rename from Pi1541.h
rename to src/Pi1541.h
diff --git a/ROMs.cpp b/src/ROMs.cpp
similarity index 100%
rename from ROMs.cpp
rename to src/ROMs.cpp
diff --git a/ROMs.h b/src/ROMs.h
similarity index 100%
rename from ROMs.h
rename to src/ROMs.h
diff --git a/Screen.cpp b/src/Screen.cpp
similarity index 100%
rename from Screen.cpp
rename to src/Screen.cpp
diff --git a/Screen.h b/src/Screen.h
similarity index 100%
rename from Screen.h
rename to src/Screen.h
diff --git a/Singleton.h b/src/Singleton.h
similarity index 100%
rename from Singleton.h
rename to src/Singleton.h
diff --git a/Timer.c b/src/Timer.c
similarity index 100%
rename from Timer.c
rename to src/Timer.c
diff --git a/Timer.h b/src/Timer.h
similarity index 100%
rename from Timer.h
rename to src/Timer.h
diff --git a/armc-cppstubs.cpp b/src/armc-cppstubs.cpp
similarity index 100%
rename from armc-cppstubs.cpp
rename to src/armc-cppstubs.cpp
diff --git a/armc-cstartup.c b/src/armc-cstartup.c
similarity index 100%
rename from armc-cstartup.c
rename to src/armc-cstartup.c
diff --git a/armc-cstubs.c b/src/armc-cstubs.c
similarity index 100%
rename from armc-cstubs.c
rename to src/armc-cstubs.c
diff --git a/armc-start.S b/src/armc-start.S
similarity index 100%
rename from armc-start.S
rename to src/armc-start.S
diff --git a/bcm2835int.h b/src/bcm2835int.h
similarity index 100%
rename from bcm2835int.h
rename to src/bcm2835int.h
diff --git a/cache.c b/src/cache.c
similarity index 100%
rename from cache.c
rename to src/cache.c
diff --git a/cache.h b/src/cache.h
similarity index 100%
rename from cache.h
rename to src/cache.h
diff --git a/debug.h b/src/debug.h
similarity index 100%
rename from debug.h
rename to src/debug.h
diff --git a/defs.h b/src/defs.h
similarity index 100%
rename from defs.h
rename to src/defs.h
diff --git a/diskio.cpp b/src/diskio.cpp
similarity index 100%
rename from diskio.cpp
rename to src/diskio.cpp
diff --git a/diskio.h b/src/diskio.h
similarity index 100%
rename from diskio.h
rename to src/diskio.h
diff --git a/emmc.cpp b/src/emmc.cpp
similarity index 100%
rename from emmc.cpp
rename to src/emmc.cpp
diff --git a/emmc.h b/src/emmc.h
similarity index 100%
rename from emmc.h
rename to src/emmc.h
diff --git a/exception.c b/src/exception.c
similarity index 100%
rename from exception.c
rename to src/exception.c
diff --git a/ff.cpp b/src/ff.cpp
similarity index 100%
rename from ff.cpp
rename to src/ff.cpp
diff --git a/ff.h b/src/ff.h
similarity index 100%
rename from ff.h
rename to src/ff.h
diff --git a/ffconf.h b/src/ffconf.h
similarity index 100%
rename from ffconf.h
rename to src/ffconf.h
diff --git a/gcr.cpp b/src/gcr.cpp
similarity index 100%
rename from gcr.cpp
rename to src/gcr.cpp
diff --git a/gcr.h b/src/gcr.h
similarity index 100%
rename from gcr.h
rename to src/gcr.h
diff --git a/iec_bus.cpp b/src/iec_bus.cpp
similarity index 100%
rename from iec_bus.cpp
rename to src/iec_bus.cpp
diff --git a/iec_bus.h b/src/iec_bus.h
similarity index 100%
rename from iec_bus.h
rename to src/iec_bus.h
diff --git a/iec_commands.cpp b/src/iec_commands.cpp
similarity index 100%
rename from iec_commands.cpp
rename to src/iec_commands.cpp
diff --git a/iec_commands.h b/src/iec_commands.h
similarity index 100%
rename from iec_commands.h
rename to src/iec_commands.h
diff --git a/integer.h b/src/integer.h
similarity index 100%
rename from integer.h
rename to src/integer.h
diff --git a/interrupt.c b/src/interrupt.c
similarity index 100%
rename from interrupt.c
rename to src/interrupt.c
diff --git a/interrupt.h b/src/interrupt.h
similarity index 100%
rename from interrupt.h
rename to src/interrupt.h
diff --git a/kernel.h b/src/kernel.h
similarity index 100%
rename from kernel.h
rename to src/kernel.h
diff --git a/logo.h b/src/logo.h
similarity index 100%
rename from logo.h
rename to src/logo.h
diff --git a/lz.c b/src/lz.c
similarity index 100%
rename from lz.c
rename to src/lz.c
diff --git a/lz.h b/src/lz.h
similarity index 100%
rename from lz.h
rename to src/lz.h
diff --git a/m6502.cpp b/src/m6502.cpp
similarity index 100%
rename from m6502.cpp
rename to src/m6502.cpp
diff --git a/m6502.h b/src/m6502.h
similarity index 100%
rename from m6502.h
rename to src/m6502.h
diff --git a/m6522.cpp b/src/m6522.cpp
similarity index 100%
rename from m6522.cpp
rename to src/m6522.cpp
diff --git a/m6522.h b/src/m6522.h
similarity index 100%
rename from m6522.h
rename to src/m6522.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/options.cpp b/src/options.cpp
similarity index 100%
rename from options.cpp
rename to src/options.cpp
diff --git a/options.h b/src/options.h
similarity index 100%
rename from options.h
rename to src/options.h
diff --git a/prot.cpp b/src/prot.cpp
similarity index 100%
rename from prot.cpp
rename to src/prot.cpp
diff --git a/prot.h b/src/prot.h
similarity index 100%
rename from prot.h
rename to src/prot.h
diff --git a/rpi-aux.c b/src/rpi-aux.c
similarity index 100%
rename from rpi-aux.c
rename to src/rpi-aux.c
diff --git a/rpi-aux.h b/src/rpi-aux.h
similarity index 100%
rename from rpi-aux.h
rename to src/rpi-aux.h
diff --git a/rpi-base.h b/src/rpi-base.h
similarity index 100%
rename from rpi-base.h
rename to src/rpi-base.h
diff --git a/rpi-gpio.c b/src/rpi-gpio.c
similarity index 100%
rename from rpi-gpio.c
rename to src/rpi-gpio.c
diff --git a/rpi-gpio.h b/src/rpi-gpio.h
similarity index 100%
rename from rpi-gpio.h
rename to src/rpi-gpio.h
diff --git a/rpi-interrupts.c b/src/rpi-interrupts.c
similarity index 100%
rename from rpi-interrupts.c
rename to src/rpi-interrupts.c
diff --git a/rpi-interrupts.h b/src/rpi-interrupts.h
similarity index 100%
rename from rpi-interrupts.h
rename to src/rpi-interrupts.h
diff --git a/rpi-mailbox-interface.c b/src/rpi-mailbox-interface.c
similarity index 100%
rename from rpi-mailbox-interface.c
rename to src/rpi-mailbox-interface.c
diff --git a/rpi-mailbox-interface.h b/src/rpi-mailbox-interface.h
similarity index 100%
rename from rpi-mailbox-interface.h
rename to src/rpi-mailbox-interface.h
diff --git a/rpi-mailbox.c b/src/rpi-mailbox.c
similarity index 100%
rename from rpi-mailbox.c
rename to src/rpi-mailbox.c
diff --git a/rpi-mailbox.h b/src/rpi-mailbox.h
similarity index 100%
rename from rpi-mailbox.h
rename to src/rpi-mailbox.h
diff --git a/rpiHardware.h b/src/rpiHardware.h
similarity index 100%
rename from rpiHardware.h
rename to src/rpiHardware.h
diff --git a/sample.h b/src/sample.h
similarity index 100%
rename from sample.h
rename to src/sample.h
diff --git a/startup.h b/src/startup.h
similarity index 100%
rename from startup.h
rename to src/startup.h
diff --git a/stb_image.h b/src/stb_image.h
similarity index 100%
rename from stb_image.h
rename to src/stb_image.h
diff --git a/stb_image_config.h b/src/stb_image_config.h
similarity index 100%
rename from stb_image_config.h
rename to src/stb_image_config.h
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h
diff --git a/xga_font_data.c b/src/xga_font_data.c
similarity index 100%
rename from xga_font_data.c
rename to src/xga_font_data.c
diff --git a/xga_font_data.h b/src/xga_font_data.h
similarity index 100%
rename from xga_font_data.h
rename to src/xga_font_data.h
diff --git a/uspi/lib/Makefile b/uspi/Makefile
similarity index 84%
rename from uspi/lib/Makefile
rename to uspi/Makefile
index 63011c5..b541fd6 100644
--- a/uspi/lib/Makefile
+++ b/uspi/Makefile
@@ -27,12 +27,19 @@ OBJS	= uspilibrary.o \
 	  dwhcirootport.o usbmouse.o \
 	  dwhciframeschednsplit.o usbgamepad.o synchronize.o usbstring.o usbmidi.o
 
-INCLUDE = -I../include
+SRCDIR  = lib
+OBJS   := $(addprefix $(SRCDIR)/, $(OBJS))
 
-all: libuspi.a
+TARGET  = libuspi
+INCLUDE = -Iinclude
 
-libuspi.a: $(OBJS)
+all: $(TARGET).a
+
+$(TARGET).a: $(OBJS)
 	@echo "  LINK $@"
-	$(Q)$(AR) cr libuspi.a $(OBJS)
+	$(Q)$(AR) cr $(TARGET).a $(OBJS)
 
-include ../../Makefile.rules
\ No newline at end of file
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).a
+
+include ../Makefile.rules
\ No newline at end of file