reorganising files

carlossless · Feb 6, 2024 · 0bf0918 · 0bf0918
1 parent 585aa5b
commit 0bf0918
Show file tree

Hide file tree

Showing 27 changed files with 39 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -47,8 +47,11 @@ MAIN_SOURCES := $(SRCDIR)/main.c \
 	$(LAYOUT_SOURCES)
 MAIN_OBJECTS := $(MAIN_SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.rel)
 
-LIB_SOURCES := $(wildcard $(SRCDIR)/lib/*.c)
-LIB_OBJECTS := $(LIB_SOURCES:$(SRCDIR)/lib/%.c=$(OBJDIR)/lib/%.rel)
+LIBSINO8051_SOURCES := $(wildcard $(SRCDIR)/lib/sh68f90a/*.c)
+LIBSINO8051_OBJECTS := $(LIBSINO8051_SOURCES:$(SRCDIR)/lib/sh68f90a/%.c=$(OBJDIR)/lib/sh68f90a/%.rel)
+
+OVERRIDABLE_SOURCES := $(wildcard $(SRCDIR)/overridable/*.c)
+OVERRIDABLE_OBJECTS := $(OVERRIDABLE_SOURCES:$(SRCDIR)/overridable/%.c=$(OBJDIR)/overridable/%.rel)
 
 .PHONY: all clean flash
 
@@ -64,13 +67,17 @@ $(OBJDIR)/%.rel: $(SRCDIR)/%.c
 	@mkdir -p $(@D)
 	$(CC) -m$(FAMILY) -l$(PROC) $(CFLAGS) -c $< -o $@
 
-$(BINDIR)/smk.lib: $(LIB_OBJECTS)
+$(BINDIR)/overridable.lib: $(OVERRIDABLE_OBJECTS)
+	@mkdir -p $(@D)
+	$(SDAR) $@ $^
+
+$(BINDIR)/sino8051.lib: $(LIBSINO8051_OBJECTS)
 	@mkdir -p $(@D)
 	$(SDAR) $@ $^
 
-$(BINDIR)/main.ihx: $(MAIN_OBJECTS) $(BINDIR)/smk.lib
+$(BINDIR)/main.ihx: $(MAIN_OBJECTS) $(BINDIR)/sino8051.lib $(BINDIR)/overridable.lib
 	@mkdir -p $(@D)
-	$(CC) -m$(FAMILY) -l$(PROC) $(LFLAGS) -o $@ $(MAIN_OBJECTS) -L$(BINDIR) -lsmk
+	$(CC) -m$(FAMILY) -l$(PROC) $(LFLAGS) -o $@ $(MAIN_OBJECTS) -L$(BINDIR) -loverridable -lsino8051
 
 $(BINDIR)/%.hex: $(BINDIR)/%.ihx
 	${PACKIHX} < $< > $@

diff --git a/src/host.c b/src/host.c
@@ -1,6 +1,6 @@
 #include "host.h"
 #include "debug.h"
-#include "usb.h"
+#include "lib/sh68f90a/usb.h"
 
 /* send report */
 void host_keyboard_send(report_keyboard_t *report)

diff --git a/src/keyboards/nuphy-air60/layouts/default/indicators.c b/src/keyboards/nuphy-air60/layouts/default/indicators.c
@@ -1,6 +1,6 @@
 #include "../../../../indicators.h"
-#include "../../../../sh68f90a.h"
-#include "../../../../pwm.h"
+#include "../../../../lib/sh68f90a/sh68f90a.h"
+#include "../../../../lib/sh68f90a/pwm.h"
 #include <stdlib.h>
 
 bool indicators_update_step(keyboard_state_t *keyboard, uint8_t current_step)

diff --git a/src/clock.c → src/lib/sh68f90a/clock.c b/src/clock.c → src/lib/sh68f90a/clock.c
diff --git a/src/clock.h → src/lib/sh68f90a/clock.h b/src/clock.h → src/lib/sh68f90a/clock.h
diff --git a/src/delay.c → src/lib/sh68f90a/delay.c b/src/delay.c → src/lib/sh68f90a/delay.c
@@ -1,6 +1,6 @@
 #include "delay.h"
 #include "watchdog.h"
-#include "utils.h"
+#include "../../utils.h"
 #include <stdint.h>
 
 // very naive implementation, not very accurate or optimized

diff --git a/src/delay.h → src/lib/sh68f90a/delay.h b/src/delay.h → src/lib/sh68f90a/delay.h
diff --git a/src/gpio.c → src/lib/sh68f90a/gpio.c b/src/gpio.c → src/lib/sh68f90a/gpio.c
diff --git a/src/gpio.h → src/lib/sh68f90a/gpio.h b/src/gpio.h → src/lib/sh68f90a/gpio.h
diff --git a/src/isp.c → src/lib/sh68f90a/isp.c b/src/isp.c → src/lib/sh68f90a/isp.c
diff --git a/src/isp.h → src/lib/sh68f90a/isp.h b/src/isp.h → src/lib/sh68f90a/isp.h
diff --git a/src/keyboard.c → src/lib/sh68f90a/keyboard.c b/src/keyboard.c → src/lib/sh68f90a/keyboard.c
@@ -1,6 +1,6 @@
-#include "keyboard.h"
+#include "../../keyboard.h"
 #include "sh68f90a.h"
-#include "debug.h"
+#include "../../debug.h"
 
 __xdata keyboard_state_t keyboard_state;
 

diff --git a/src/ldo.c → src/lib/sh68f90a/ldo.c b/src/ldo.c → src/lib/sh68f90a/ldo.c
diff --git a/src/ldo.h → src/lib/sh68f90a/ldo.h b/src/ldo.h → src/lib/sh68f90a/ldo.h
diff --git a/src/pwm.c → src/lib/sh68f90a/pwm.c b/src/pwm.c → src/lib/sh68f90a/pwm.c
@@ -1,5 +1,5 @@
 #include "pwm.h"
-#include "matrix.h"
+#include "../../matrix.h"
 #include <stdint.h>
 #include <stdio.h>
 

diff --git a/src/pwm.h → src/lib/sh68f90a/pwm.h b/src/pwm.h → src/lib/sh68f90a/pwm.h
diff --git a/src/sh68f90a.h → src/lib/sh68f90a/sh68f90a.h b/src/sh68f90a.h → src/lib/sh68f90a/sh68f90a.h
diff --git a/src/uart.c → src/lib/sh68f90a/uart.c b/src/uart.c → src/lib/sh68f90a/uart.c
diff --git a/src/uart.h → src/lib/sh68f90a/uart.h b/src/uart.h → src/lib/sh68f90a/uart.h
diff --git a/src/usb.c → src/lib/sh68f90a/usb.c b/src/usb.c → src/lib/sh68f90a/usb.c
@@ -1,12 +1,12 @@
 #include "usb.h"
 #include "watchdog.h"
 #include "isp.h"
-#include "usbdef.h"
+#include "../../usbdef.h"
 #include "usbregs.h"
-#include "debug.h"
-#include "utils.h"
-#include "usbhidreport.h"
-#include "keyboard.h"
+#include "../../debug.h"
+#include "../../utils.h"
+#include "../../usbhidreport.h"
+#include "../../keyboard.h"
 #include <stdint.h>
 #include <string.h>
 

diff --git a/src/usb.h → src/lib/sh68f90a/usb.h b/src/usb.h → src/lib/sh68f90a/usb.h
@@ -2,7 +2,7 @@
 #define USB_H
 
 #include "sh68f90a.h"
-#include "report.h"
+#include "../../report.h"
 #include <stdint.h>
 
 void usb_init();

diff --git a/src/usbregs.h → src/lib/sh68f90a/usbregs.h b/src/usbregs.h → src/lib/sh68f90a/usbregs.h
diff --git a/src/watchdog.h → src/lib/sh68f90a/watchdog.h b/src/watchdog.h → src/lib/sh68f90a/watchdog.h
diff --git a/src/main.c b/src/main.c
@@ -1,18 +1,19 @@
-#include "clock.h"
-#include "ldo.h"
-#include "watchdog.h"
-#include "delay.h"
-#include "isp.h"
-#include "uart.h"
-#include "stdio.h"
-#include "gpio.h"
+#include "lib/sh68f90a/clock.h"
+#include "lib/sh68f90a/ldo.h"
+#include "lib/sh68f90a/watchdog.h"
+#include "lib/sh68f90a/delay.h"
+#include "lib/sh68f90a/isp.h"
+#include "lib/sh68f90a/uart.h"
+#include "lib/sh68f90a/gpio.h"
 #include "matrix.h"
-#include "pwm.h"
-#include "usb.h"
+#include "lib/sh68f90a/pwm.h"
+#include "lib/sh68f90a/usb.h"
 #include "debug.h"
 #include "utils.h"
 #include "keyboard.h"
 
+#include <stdio.h>
+
 void init()
 {
     ldo_init();

diff --git a/src/matrix.c b/src/matrix.c
@@ -1,7 +1,7 @@
 #include "matrix.h"
-#include "sh68f90a.h"
-#include "pwm.h"
-#include "delay.h"
+#include "lib/sh68f90a/sh68f90a.h"
+#include "lib/sh68f90a/pwm.h"
+#include "lib/sh68f90a/delay.h"
 #include "layout.h"
 #include "report.h"
 #include "debug.h"

diff --git a/src/lib/indicators.c → src/overridable/indicators.c b/src/lib/indicators.c → src/overridable/indicators.c
diff --git a/src/lib/layout.c → src/overridable/layout.c b/src/lib/layout.c → src/overridable/layout.c