modify a lot of file to support stoneQ

- Makefiles.
- move stone.c directory
- change name to stoneQ to datablock

Author: YanB25

step_3/Makefile

@@ -11,7 +11,8 @@ LOADER=loader
 ROOT=..
 FILESYSTEM=filesystem
 USER=user
-all: $(USER)/stone.bin $(KERNEL)/kernel.bin $(LOADER)/loader.bin build cleangch
+STONE=stone
+all: $(USER)/$(STONE)/stoneQ.bin $(KERNEL)/kernel.bin $(LOADER)/loader.bin build cleangch
 
 $(KERNEL)/kernel.bin: 
 	echo "\n"
@@ -43,7 +44,7 @@ $(FILESYSTEM)/datablock.bin:
 	cd $(FILESYSTEM)/ && make 
 	cd $(ROOT)/
 
-$(USER)/stone.bin:
+$(USER)/$(STONE)/stoneQ.bin:
 	echo "\n"
 	cd $(USER)/ && make 
 	cd $(ROOT)/
@@ -56,7 +57,7 @@ build: $(LOADER)/loader.bin $(FILESYSTEM)/DBR.bin $(FILESYSTEM)/FAT.bin $(FILESY
 	dd if=$(FILESYSTEM)/FAT.bin of=OS.img conv=notrunc oflag=seek_bytes seek=3584
 	dd if=$(FILESYSTEM)/datablock.bin of=OS.img conv=notrunc oflag=seek_bytes seek=6656
 	dd if=$(KERNEL)/kernel.bin of=OS.img conv=notrunc oflag=seek_bytes seek=7680
-	dd if=$(USER)/stone.bin of=OS.img conv=notrunc oflag=seek_bytes seek=12800
+	dd if=$(USER)/$(STONE)/stoneQ.bin of=OS.img conv=notrunc oflag=seek_bytes seek=12800
 clean:
 	echo "\n"
 	find . -name "*.bin" -type f -delete

step_3/filesystem/datablock.c

@@ -64,7 +64,7 @@ FAT_ITEM msg = {
     0
 };
 FAT_ITEM user_program = {
-    "stone",
+    "stoneQ",
     "bin",
     FAT_rw,
     0, 0, 0, 0, 0, 0,

step_3/kernel/Makefile

@@ -9,9 +9,10 @@ ROOT=..
 INCLUDE=../include
 USER=../user
 FILESYSTEM=../filesystem
+STONE=stone
 
 USER_HEADER=$(USER)/user.h $(USER)/terminal.h 
-USER_OBJ=$(USER)/user.o $(USER)/terminal.o $(USER)/stone.o
+USER_OBJ=$(USER)/user.o $(USER)/terminal.o $(USER)/$(STONE)/stoneQ.o
 
 all: kernel.bin
 
@@ -31,6 +32,9 @@ $(INCLUDE)/mystring.o:
 $(FILESYSTEM)/fsutilities.o:
 	cd $(FILESYSTEM)/ && make 
 	cd ../kernel
+$(USER)/$(STONE)/stoneQ.o:
+	cd $(USER)/ && make
+	cd ../kernel
 clean:
 	rm *.bin -f 
 	rm *.o -f  

step_3/user/Makefile

@@ -6,18 +6,18 @@ AS=nasm
 ASFLAGS=
 
 UTILITIES=../include
-
-all: user.o terminal.o stone.bin
+STONE=stone
+all: user.o terminal.o $(STONE)/stoneQ.bin
 
 user.o: user.c $(UTILITIES)/utilities.h
 	$(CC) $(CCFLAGS) -c $^
-terminal.o: terminal.c $(UTILITIES)/utilities.h stone.h
+terminal.o: terminal.c $(UTILITIES)/utilities.h 
 	$(CC) $(CCFLAGS) -c $^
 
-stone.bin: stone.o $(UTILITIES)/utilities.o
+$(STONE)/stoneQ.bin: $(STONE)/stoneQ.o $(UTILITIES)/utilities.o
 	$(LD) $(LDFLAGS) -Ttext 0x6C00 --oformat binary -o $@ $^
-stone.o: stone.c $(UTILITIES)/utilities.h
-	$(CC) $(CCFLAGS) -c $^
+$(STONE)/stoneQ.o: $(STONE)/stone.c $(UTILITIES)/utilities.h
+	$(CC) $(CCFLAGS) -c $< -D UL -o $@
 
 $(UTILITIES)/utilities.o:
 	cd $(UTILITIES)/ && make

step_3/user/stone.h

@@ -1,6 +1,7 @@
 __asm__("jmpl $0, $stone\n");
 
-#include "../include/utilities.h"
+#include "../../include/utilities.h"
+#include "stone.h"
 #define DELAY (1e5)
 int getKbHit();
 void checkBound();
@@ -11,8 +12,8 @@ int deltax;
 int deltay;
 int stone() {
     // return 0;
-    x = 5;
-    y = 5;
+    x = _X;
+    y = _Y;
     deltax = 1;
     deltay = 1;
 
@@ -41,8 +42,8 @@ int getKbHit() {
     return 0;
 }
 void checkBound() {
-    if (x == 0) deltax = 1;
-    if (x == 79) deltax = -1;
-    if (y == 0) deltay = 1;
-    if (y == 24) deltay = -1;
+    if (x <= LEFT_B) deltax = 1;
+    if (x >= RIGHT_B) deltax = -1;
+    if (y <= UP_B) deltay = 1;
+    if (y >= DOWN_B) deltay = -1;
 }

step_3/user/stone.c step_3/user/stone/stone.cstep_3/user/stone.c renamed to step_3/user/stone/stone.c

@@ -0,0 +1,19 @@
+#ifndef __STONE_H_
+#define __STONE_H_
+#if defined(UL)
+    #define _X 5
+    #define _Y 5
+    #define LEFT_B 1
+    #define RIGHT_B 40
+    #define UP_B 1
+    #define DOWN_B 12
+#elif defined(UR)
+    #define _X 70
+    #define _Y 5
+    #define LEFT_B 40
+    #define RIGHT_B 79
+    #define UP_B 1
+    #define DOWN_B 12
+#endif
+
+#endif

step_3/user/stone/stone.h

@@ -1,6 +1,5 @@
 #include "../include/utilities.h"
 #include "../include/mystring.h"
-#include "stone.h"
 #include "../filesystem/API/fsapi.h"
 
 #define BACK_SPACE 8