From f2f363b8a8d1e93ec64a56cf672849f80d60c762 Mon Sep 17 00:00:00 2001
From: Andrei Warkentin <andrey.warkentin@gmail.com>
Date: Thu, 5 Nov 2015 00:32:51 +0000
Subject: [PATCH] pijFORTHos: move all the rpi stuff into rpi/

I really just want this to be a bunch of useful
stuff built around a generic jonesforth.s.

Signed-off-by: Andrei Warkentin <andrey.warkentin@gmail.com>
---
 AUTHORS                                 |   2 ++
 doc/forth.md                            |   1 +
 kernel.img                              | Bin 9056 -> 0 bytes
 Makefile => rpi/Makefile                |   7 ++-----
 README.md => rpi/README.md              |   0
 blinker.f => rpi/blinker.f              |   0
 {doc => rpi/doc}/blinker.md             |   0
 {doc => rpi/doc}/bootload.md            |   0
 {firmware => rpi/firmware}/bootcode.bin | Bin
 {firmware => rpi/firmware}/start.elf    | Bin
 loadmap => rpi/loadmap                  |   0
 raspberry.c => rpi/raspberry.c          |   0
 raspi.h => rpi/raspi.h                  |   0
 serial.c => rpi/serial.c                |   0
 serial.h => rpi/serial.h                |   0
 start.s => rpi/start.s                  |   0
 timer.c => rpi/timer.c                  |   0
 timer.h => rpi/timer.h                  |   0
 xmodem.c => rpi/xmodem.c                |   0
 xmodem.h => rpi/xmodem.h                |   0
 20 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100755 kernel.img
 rename Makefile => rpi/Makefile (85%)
 rename README.md => rpi/README.md (100%)
 rename blinker.f => rpi/blinker.f (100%)
 rename {doc => rpi/doc}/blinker.md (100%)
 rename {doc => rpi/doc}/bootload.md (100%)
 rename {firmware => rpi/firmware}/bootcode.bin (100%)
 rename {firmware => rpi/firmware}/start.elf (100%)
 rename loadmap => rpi/loadmap (100%)
 rename raspberry.c => rpi/raspberry.c (100%)
 rename raspi.h => rpi/raspi.h (100%)
 rename serial.c => rpi/serial.c (100%)
 rename serial.h => rpi/serial.h (100%)
 rename start.s => rpi/start.s (100%)
 rename timer.c => rpi/timer.c (100%)
 rename timer.h => rpi/timer.h (100%)
 rename xmodem.c => rpi/xmodem.c (100%)
 rename xmodem.h => rpi/xmodem.h (100%)

diff --git a/AUTHORS b/AUTHORS
index f48cbd7..77cba5b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
+Andrei Warkentin <andrey.warkentin@gmail.com>
+
 Bare-metal Raspberry Pi port by:
 
 Dale Schumacher <dale.schumacher@gmail.com>
diff --git a/doc/forth.md b/doc/forth.md
index 85ed00d..0a57e5c 100644
--- a/doc/forth.md
+++ b/doc/forth.md
@@ -196,6 +196,7 @@ so you can see related words together.
 | `;CODE` | ( -- ) | start the native code part of a CREATEd defining word |
 | `(END-CODE)` | ( -- ) | end FORTH native code word definition |
 | `END-CODE` | ( -- ) | append $NEXT and end FORTH native code word definition |
+| `DOES>` | ( -- ) | start the FORTH part of a CREATEd defining word |
 | `$NEXT` | ( -- ) | emit native code to run the next word |
 | `IMMEDIATE` | ( -- ) | set IMMEDIATE flag of last defined word |
 | `HIDDEN` | ( entry -- ) | toggle HIDDEN flag of a word |
diff --git a/kernel.img b/kernel.img
deleted file mode 100755
index 7b2ceb854985409a5637def562cf20cd1a3d7c4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9056
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
YuTF*cbuLnqzxA(<_3EGI%pdai|H^Mkp#T5?

diff --git a/Makefile b/rpi/Makefile
similarity index 85%
rename from Makefile
rename to rpi/Makefile
index f544351..6ee51c7 100644
--- a/Makefile
+++ b/rpi/Makefile
@@ -15,11 +15,8 @@ all: kernel.img
 start.o: start.s
 	$(AS) start.s -o start.o
 
-jonesforth.o: jonesforth.s
-	$(AS) jonesforth.s -o jonesforth.o
-
-#raspberry.o: raspberry.c
-#	$(CC) -c raspberry.c -o raspberry.o
+jonesforth.o: ../jonesforth.s
+	$(AS) -o $@ $<
 
 kernel.img: loadmap $(KOBJS)
 	$(LD) $(KOBJS) -T loadmap -o pijFORTHos.elf
diff --git a/README.md b/rpi/README.md
similarity index 100%
rename from README.md
rename to rpi/README.md
diff --git a/blinker.f b/rpi/blinker.f
similarity index 100%
rename from blinker.f
rename to rpi/blinker.f
diff --git a/doc/blinker.md b/rpi/doc/blinker.md
similarity index 100%
rename from doc/blinker.md
rename to rpi/doc/blinker.md
diff --git a/doc/bootload.md b/rpi/doc/bootload.md
similarity index 100%
rename from doc/bootload.md
rename to rpi/doc/bootload.md
diff --git a/firmware/bootcode.bin b/rpi/firmware/bootcode.bin
similarity index 100%
rename from firmware/bootcode.bin
rename to rpi/firmware/bootcode.bin
diff --git a/firmware/start.elf b/rpi/firmware/start.elf
similarity index 100%
rename from firmware/start.elf
rename to rpi/firmware/start.elf
diff --git a/loadmap b/rpi/loadmap
similarity index 100%
rename from loadmap
rename to rpi/loadmap
diff --git a/raspberry.c b/rpi/raspberry.c
similarity index 100%
rename from raspberry.c
rename to rpi/raspberry.c
diff --git a/raspi.h b/rpi/raspi.h
similarity index 100%
rename from raspi.h
rename to rpi/raspi.h
diff --git a/serial.c b/rpi/serial.c
similarity index 100%
rename from serial.c
rename to rpi/serial.c
diff --git a/serial.h b/rpi/serial.h
similarity index 100%
rename from serial.h
rename to rpi/serial.h
diff --git a/start.s b/rpi/start.s
similarity index 100%
rename from start.s
rename to rpi/start.s
diff --git a/timer.c b/rpi/timer.c
similarity index 100%
rename from timer.c
rename to rpi/timer.c
diff --git a/timer.h b/rpi/timer.h
similarity index 100%
rename from timer.h
rename to rpi/timer.h
diff --git a/xmodem.c b/rpi/xmodem.c
similarity index 100%
rename from xmodem.c
rename to rpi/xmodem.c
diff --git a/xmodem.h b/rpi/xmodem.h
similarity index 100%
rename from xmodem.h
rename to rpi/xmodem.h