emul: bring "hw" subfolders one level higher

emul/README.md

@@ -28,7 +28,6 @@ because the goal here is to facilitate "high level" development.
 
 These apps run on imaginary hardware and use many cheats to simplify I/Os.
 
-For real hardware emulation (which helps developing drivers), see the `hw`
-folder.
+For real hardware emulation (which helps developing drivers), see subfolders.
 
 [libz80]: https://github.com/ggambetta/libz80

emul/hw/README.md

@@ -1,10 +0,0 @@
-# Hardware emulation
-
-In this folder, we emulate some of the hardware used in recipes. The emulation
-is done in a simplistic manner, just enough to verify that the driver code for
-it works generally well. No tricky stuff implemented.
-
-This kind of emulation is useful for detecting obvious regressions without
-having to get the code on actual hardware for the upteenth time.
-
-To use, go to the appropriate subfolder and read README there.

emul/hw/rc2014/Makefile → emul/rc2014/Makefile

@@ -1,12 +1,12 @@
-EXTOBJS = ../../emul.o ../../libz80/libz80.o
+EXTOBJS = ../emul.o ../libz80/libz80.o
 OBJS = sio.o acia.o sdc.o classic.o 
 TARGET = classic
 
 .PHONY: all
 all: $(TARGET)
 
-../../emul.o:
-	make -C ../..
+../emul.o:
+	make -C ..
 
 $(TARGET): $(OBJS) $(EXTOBJS)
 	$(CC) $(OBJS) $(EXTOBJS) -o $@

emul/hw/rc2014/classic.c → emul/rc2014/classic.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <termios.h>
-#include "../../emul.h"
+#include "../emul.h"
 #include "acia.h"
 #include "sio.h"
 #include "sdc.h"

emul/hw/sms/Makefile → emul/sms/Makefile

@@ -1,4 +1,4 @@
-EXTOBJS = ../../emul.o ../../libz80/libz80.o
+EXTOBJS = ../emul.o ../libz80/libz80.o
 OBJS = sms.o vdp.o port.o pad.o kbd.o
 TARGET = sms
 CFLAGS += `pkg-config --cflags xcb`
@@ -7,8 +7,8 @@ LDFLAGS += `pkg-config --libs xcb`
 .PHONY: all
 all: $(TARGET)
 
-../../emul.o:
-	make -C ../..
+../emul.o:
+	make -C ..
 
 $(TARGET): $(OBJS) $(EXTOBJS)
 	$(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)

emul/hw/sms/port.h → emul/sms/port.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../../emul.h"
+#include "../emul.h"
 
 // Each port is a bitmask of each pin's status. 1 means high.
 // From Bit 0 to 6: up, down, left, right, TL, TR, TH

emul/hw/sms/sms.c → emul/sms/sms.c

@@ -7,7 +7,7 @@
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 
-#include "../../emul.h"
+#include "../emul.h"
 #include "vdp.h"
 #include "port.h"
 #include "pad.h"

emul/hw/ti/Makefile → emul/ti/Makefile

@@ -1,4 +1,4 @@
-EXTOBJS = ../../emul.o ../../libz80/libz80.o
+EXTOBJS = ../emul.o ../libz80/libz80.o
 OBJS = ti84.o t6a04.o kbd.o 
 TARGET = ti84
 CFLAGS += `pkg-config --cflags xcb`
@@ -7,8 +7,8 @@ LDFLAGS += `pkg-config --libs xcb`
 .PHONY: all
 all: $(TARGET)
 
-../../emul.o:
-	make -C ../..
+../emul.o:
+	make -C ..
 
 $(TARGET): $(OBJS) $(EXTOBJS)
 	$(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)

emul/hw/ti/ti84.c → emul/ti/ti84.c

@@ -14,7 +14,7 @@
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 
-#include "../../emul.h"
+#include "../emul.h"
 #include "t6a04.h"
 #include "kbd.h"
 

recipes/rc2014/Makefile

@@ -4,7 +4,7 @@ CDIR = $(BASE)/cvm
 EDIR = $(BASE)/emul
 STAGE = $(CDIR)/stage
 BLKPACK = $(BASE)/tools/blkpack
-EMUL = $(EDIR)/hw/rc2014/classic
+EMUL = $(EDIR)/rc2014/classic
 
 .PHONY: all
 all: $(TARGET) 

recipes/sms/Makefile

@@ -1,9 +1,9 @@
 TARGET = os.bin
-BASE = ../../
+BASE = ../..
 STAGE = $(BASE)/cvm/stage
 BLKPACK = $(BASE)/tools/blkpack
 SMSROM = $(BASE)/tools/smsrom
-EMUL = $(BASE)/emul/hw/sms/sms
+EMUL = $(BASE)/emul/sms/sms
 
 .PHONY: all
 all: $(TARGET) 

recipes/ti84/Makefile

@@ -3,7 +3,7 @@ BASE = ../..
 CDIR = $(BASE)/cvm
 STAGE = $(CDIR)/stage
 BLKPACK = $(BASE)/tools/blkpack
-EMUL = $(BASE)/emul/hw/ti/ti84
+EMUL = $(BASE)/emul/ti/ti84
 MKTIUPGRADE = mktiupgrade
 
 .PHONY: all