merge

Author: samsa1

Makefile

@@ -1,7 +1,7 @@
 all: disk run
 
 setup:
-	rustup override set nightly-2021-05-11
+	rustup override set nightly-2021-05-18
 	rustup update
 	cargo update
 	cargo install bootimage
@@ -11,13 +11,13 @@ setup:
 disk:
 	python3 ./disk/createDisk.py
 
-ferros_release: fmt
+ferros_release:
 	cargo build --release
 
 ferros:
 	cargo build
 
-run: fmt
+run:
 	cargo run --release
 
 fmt:
@@ -29,16 +29,22 @@ doc: fmt
 clean: fmt
 	cargo clean
 
-sound: fmt
+sound:
 	cargo run -- -soundhw pcspk -drive format=raw,file=disk/disk.disk,index=2 -boot c
 
 count: fmt
 	wc -l `find src -type f` -l `find disk -type f`
 
-memory: fmt
+memory:
 	qemu-system-x86_64 -drive format=raw,file=target/x86_64-ferros/debug/bootimage-ferr_os.bin	-drive format=raw,file=disk/disk.img,index=2 -boot c
 
-memory2: fmt
+memory2:
 	qemu-system-x86_64 -drive format=raw,file=target/x86_64-ferros/debug/bootimage-ferr_os.bin	-drive format=raw,file=disk/disk.disk,index=2 -boot c
 
+config:
+	rustup override nightly
+	cargo install bootimage
+	rustup component add llvm-tools-preview
+	rustup component ad rust-src
+
 .PHONY: all run fmt doc clean count sound memory memory2 disk

README.md

@@ -6,7 +6,7 @@
 - cargo
 - rustup
 - qemu
-
+- Python 3.8
 ## Installation
 Install the dependencies.
 
@@ -25,3 +25,8 @@ Then run these three commands in the root directory of the project:
 - Clean: `make clean`
 - Format: `make fmt`
 - Count the number of lines: `make count`
+
+## Accessing the report
+- It is accessible in `/docs`
+- Compile the files with `make`
+- Find them in `/docs/artifacts`

disk/diskStructures.py

@@ -26,7 +26,7 @@ def part(self, i):
         if i < 2:
             return (self.lba >> (8 * (1-i))) & 255
         else:
-            return ((self.index + 1) >> (8 * (3-i))) & 255
+            return ((self.index) >> (8 * (3-i))) & 255
 
 
 
@@ -88,7 +88,7 @@ def get_data(self):
         return perm(self.data)
 
     def mode(self):
-        if len(self) < SHORT_MODE_LIMIT * BLOCK_SIZE:
+        if len(self) <= SHORT_MODE_LIMIT * BLOCK_SIZE:
             return 0
         else:
             return 1

docs/Makefile

@@ -1,10 +1,10 @@
+LATEX = xelatex
+BIBTEX = bibtex
 PANDOC = pandoc
 PANDOC-TEMPLATE = template.latex
-PANDOC-FLAGS = --template $(PANDOC-TEMPLATE) --listings --pdf-engine=xelatex -V geometry:a4paper -V geometry:margin=2cm
-PANDOC-BEAMER-FLAGS = --template $(PANDOC-TEMPLATE) --listings --slide-level 2 --pdf-engine=xelatex
+PANDOC-FLAGS = --template $(PANDOC-TEMPLATE) --listings --pdf-engine=$(LATEX) -V geometry:a4paper -V geometry:margin=2cm
+PANDOC-BEAMER-FLAGS = --listings --slide-level 2 --pdf-engine=$(LATEX)
 
-XELATEX = xelatex
-BIBTEX = bibtex
 
 REPORT_SRC = report/report.md
 REPORT_PDF = report.pdf