Merge branch 'new-dev'

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "rust-analyzer.checkOnSave": true,
+    "rust-analyzer.cargo.features": [
+        "qemu"
+    ]
+}

Cargo.toml

@@ -15,27 +15,20 @@ members = [
     "apps/printdemo",
     "apps/egui",
     "apps/sysinfo",
-    #    "apps/dbfs",
     "apps/init",
     "apps/ls",
     "apps/mkdir",
     "apps/pwd",
     "apps/shell",
-    "apps/filetest_simple",
-    "apps/hugewrite",
-    "apps/hugeread",
     "apps/touch",
-    "apps/throughput",
-    "apps/randrw",
-    "apps/sequencewr",
     "apps/run_test",
     "apps/guitest",
     "apps/slint",
     "apps/socket_test",
     "apps/tests",
     "apps/memory-game",
     "apps/print",
-    "apps/final_test"
+    "apps/final_test",
 ]
 
 

Makefile

@@ -104,6 +104,7 @@ user:
 	@cd apps && make all
 
 sdcard:fat32 testelf user
+	@sudo umount /fat
 
 run:sdcard install compile
 	@echo qemu booot $(SMP)
@@ -153,11 +154,10 @@ f_test:
 	    -device virtio-net-device,netdev=net -netdev user,id=net
 
 testelf:
-	if [ -d "sdcard" ]; then \
+	@if [ -d "sdcard" ]; then \
 		sudo cp sdcard/* /fat -r; \
-		sudo cp sdcard/* /fat/bin -r;\
+#		sudo cp sdcard/* /fat/bin -r;\
 	fi
-	@sync
 
 dtb:
 	$(call boot_qemu, -machine dumpdtb=riscv.dtb)
@@ -177,10 +177,7 @@ ZeroFile:
 	@dd if=/dev/zero of=$(IMG) bs=1M count=64
 
 fat32:
-	if [ -f "$(IMG)" ]; then \
-		rm $(IMG); \
-		touch $(IMG); \
-	fi
+	@-touch $(IMG)
 	@dd if=/dev/zero of=$(IMG) bs=1M count=72
 	@mkfs.fat -F 32 $(IMG)
 	@if mountpoint -q /fat; then \
@@ -190,7 +187,7 @@ fat32:
 	@sudo cp tools/f1.txt /fat
 	@sudo mkdir /fat/folder
 	@sudo cp tools/f1.txt /fat/folder
-	@sync
+	@echo fat32 has been created
 
 
 img-hex:
@@ -226,4 +223,7 @@ clean:
 	@rm alien-*
 
 
+check:
+	cargo check --target riscv64gc-unknown-none-elf --features $(FEATURES)
+
 .PHONY: all install build run clean fake_run sdcard vf2 unmatched gdb-client gdb-server kernel_asm docs

apps/Makefile

@@ -8,8 +8,7 @@ GUI ?=n
 
 all:build
 	@echo "Moving apps to /fat32/bin"
-	@$(foreach dir, $(BUILD_CRATES), (sudo cp $(target)$(dir) /fat/bin/$(dir););)
-	@sync
+	@$(foreach dir, $(BUILD_CRATES), (sudo cp $(target)$(dir) /fat/$(dir););)
 
 
 build: