Merge pull request #66 from differrari/redlib

Redlib

Author: differrari

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared"]
+	path = shared
+	url = ../redlib

Makefile

@@ -16,7 +16,7 @@ all: kshared modules kernel shared user utils bins
 	./createfs
 
 kshared:
-	$(MAKE) -C shared SH_FLAGS=-DKERNEL BUILD_DIR=./kbuild TARGET=klibshared.a
+	$(MAKE) -C shared kern
 
 modules: kshared
 	$(MAKE) -C modules XHCI_CTX_SIZE=$(XHCI_CTX_SIZE) QEMU=$(QEMU) TEST=$(TEST) DRIVER_TARGET=$(MODE)
@@ -52,9 +52,6 @@ clean:
 	@echo "removing images"
 	$(RM) kernel.img kernel.elf disk.img dump
 
-cross:
-	$(MAKE) -C shared ARCH= SH_FLAGS=-DCROSS BUILD_DIR=./cbuild TARGET=clibshared.a
-
 raspi:
 	$(MAKE) LOAD_ADDR=0x80000 XHCI_CTX_SIZE=64 QEMU=true MODE=raspi all
 	./run_raspi
@@ -76,7 +73,7 @@ dump:
 
 install:
 	$(MAKE) clean
-	$(MAKE) LOAD_ADDR=0x80000 XHCI_CTX_SIZE=64 QEMU=false all
+	$(MAKE) LOAD_ADDR=0x80000 XHCI_CTX_SIZE=64 QEMU=false MODE=raspi all
 	cp kernel.img $(BOOTFS)/kernel8.img
 	cp kernel.img $(BOOTFS)/kernel_2712.img
 	cp config.txt $(BOOTFS)/config.txt

kernel/bin/ping.c

@@ -42,7 +42,7 @@ static bool parse_args(int argc, char *argv[], ping_opts_t *o) {
     o->src_set = false;
     o->host = NULL;
 
-    for (int i = 0; i < argc; ++i) {
+    for (int i = 1; i < argc; ++i) {
         const char *a = argv[i];
         if (a && a[0] == '-') {
             if (strcmp_case(a, "-4",true) == 0) o->ver = IP_VER4;

kernel/bin/shutdown.c

@@ -27,7 +27,7 @@ int run_shutdown(int argc, char* argv[]){
 
     int mode = -1;
 
-    for (int i = 0; i < argc; ++i){
+    for (int i = 1; i < argc; ++i){
         const char *a = argv[i];
         if (!a || a[0] == 0) continue;
 

kernel/bin/tracert.c

@@ -43,7 +43,7 @@ static bool parse_args(int argc, char *argv[], tr_opts_t *o) {
     o->src_set = false;
     o->host = NULL;
 
-    for (int i = 0; i < argc; i++) {
+    for (int i = 1; i < argc; i++) {
         const char *a = argv[i];
         if (a && a[0] == '-') {
             if (strcmp_case(a, "-4",true) == 0) {

kernel/console/kio.c

@@ -5,7 +5,7 @@
 #include "memory/page_allocator.h"
 #include "std/memory.h"
 #include "math/math.h"
-#include "data_struct/ring_buffer.h"
+#include "data/struct/ring_buffer.h"
 
 static bool use_visual = false;
 

kernel/dev/driver_base.c

@@ -1,5 +1,5 @@
 #include "driver_base.h"
-#include "data_struct/hashmap.h"
+#include "data/struct/hashmap.h"
 #include "std/string.h"
 
 uint64_t fd_id = 256;//First byte reserved

kernel/dev/module_loader.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "driver_base.h"
-#include "data_struct/linked_list.h"
+#include "data/struct/linked_list.h"
 
 #ifdef __cplusplus 
 extern "C" {

kernel/filesystem/fat32.hpp

@@ -3,7 +3,7 @@
 #include "types.h"
 #include "std/string.h"
 #include "fsdriver.hpp"
-#include "data_struct/hashmap.h"
+#include "data/struct/hashmap.h"
 
 typedef struct fat32_mbs {
     uint8_t jumpboot[3];//3

kernel/filesystem/pipe.c

@@ -1,8 +1,8 @@
 #include "pipe.h"
 #include "filesystem.h"
 #include "memory/page_allocator.h"
-#include "data_struct/hashmap.h"
-#include "data_struct/linked_list.h"
+#include "data/struct/hashmap.h"
+#include "data/struct/linked_list.h"
 #include "process/scheduler.h"
 
 static void *pipe_page;