* Now can change the shell prompt message

* New command export

Author: Arun007coder

Drivers/Keyboard.cpp

@@ -3,6 +3,10 @@
 static int keybufferpoint = 0;
 static bool isShift = false;
 static bool isCTRLed = false;
+
+
+
+bool isUSRChanged = false;
 void printf(char*);
 void printfchar(char st);
 void printHex(uint8_t key);
@@ -34,6 +38,18 @@ CommandPort(0x64)
     Task task2(&gdt, taskB);
     taskManager.AddTask(&task1);
     taskManager.AddTask(&task2);
+
+    for(int i = 0; i < 30; i++)
+    {
+        SP[i] = "\0";
+    }
+
+    char* Shell_Prompt[15] = {"r","o","o","t","@","s","e","c","o","s",":","~","#",">", " "};
+    for (int i = 0; i < 15; i++)
+    {
+        SP[SPIndex] = Shell_Prompt[i];
+        SPIndex++;
+    }
 }
 
 KeyboardDriver::~KeyboardDriver()
@@ -302,6 +318,13 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         {
             printf("cannot print null character");
         }
+        else if (key_buffer[5] == "$" && key_buffer[6] == "S" && key_buffer[7] == "P")
+        {
+            for (int i = 0; i < SPIndex; i++)
+            {
+                printf(SP[i]);
+            }
+        }
         else
         {
             for (int i = 5; key_buffer[i] != "\n"; i++)
@@ -328,15 +351,20 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         else if (key_buffer[5] == "3")
             printf("Help page 3:\nspi : To print the data in serial port 0x3F8.\nspo : To write data to serial port 0x3F8.\nsysinfo [option] : To get info about system.\nvga : To use experimental vga graphics.");
         else if (key_buffer[5] == "4")
-            printf("Help page 4:\nlspt: To list partitions in a drive.\ntsk:to change instance.[EXPERIMENTAL]");
+            printf("Help page 4:\nlspt: To list partitions in a drive.\ntsk:to change instance.[EXPERIMENTAL]\nexport [var]=[value] : To change value of a ENV var in shell.");
         else
             printf("Help page 1:\necho <message> : to print the message in the console \nhelp : to show this message \nclear : to clear the screen \nsd <options> : controls the power of the computer ");
     }
     else if (key_buffer[0] == "c" & key_buffer[1] == "l" & key_buffer[2] == "e" & key_buffer[3] == "a" & key_buffer[4] == "r")
     {
         COMNAME = "clear";
         printf("\5");
-        printf("SectorOS Monolithic kernel ");PrintDate();printf("                               Type: Shell\n");
+            
+        printf("SectorOS ");
+        printf(KERNEL_VERSION);
+        printf("                   ");
+        PrintDate();
+        printf("                        Type: Shell ");
     }
     else if (key_buffer[0] == "s" & key_buffer[1] == "d")
     {
@@ -487,13 +515,37 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         printf("esp2 is :"); printHex(esp2);
         isESPChanged = true;
     }
+    else if (key_buffer[0] == "e" && key_buffer[1] == "x" && key_buffer[2] == "p" && key_buffer[3] == "o" && key_buffer[4] == "r" && key_buffer[5] == "t")
+    {
+        COMNAME = "export";
+
+        if (key_buffer[7] == "S" && key_buffer[8] == "P" && key_buffer[9] == "=" )
+        {
+            SPIndex = 0;
+
+            for (int i = 10; key_buffer[i] != "\n"; i++)
+            {
+                SP[SPIndex] = key_buffer[i];
+                SPIndex++;
+            }
+            printf("SP is set to : ");
+            for (int i = 0; i < SPIndex; i++)
+            {
+                printf(SP[i]);
+            }
+        }
+    }
     else
     {
         printf("Unknown Command. Type help in console to get all the commands");
     }
     if(!isTxtMode){
         printf("\n");
-        printf("$: ");
+        for (int i = 0; SPIndex > i; i++)
+        {
+            printf(SP[i]);
+        }
+        
     }
     serialport.logToSerialPort("Command interpreter got a command :- "); serialport.logToSerialPort(COMNAME); serialport.logToSerialPort("\n");
     clear_key_buffer();
@@ -507,12 +559,17 @@ void KeyboardDriver::returnHScreen()
     //ColourPrint(0);
     //printf("Welcome to SectorOS Monolithic kernel                               Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
 
-    printf("SectorOS Monolithic kernel ");
+    printf("SectorOS ");
+    printf(KERNEL_VERSION);
+    printf("                   ");
     PrintDate();
-    printf("                               Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
+    printf("                        Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
     printf("Run help to get the list of commands which is implemented \n \n");
 
-    printf("$: ");
+    for (int i = 0; SPIndex > i; i++)
+    {
+        printf(SP[i]);
+    }
     isTxtMode = false;
 }
 

Hardcom/SerialPort.cpp

@@ -5,7 +5,7 @@ void printfchar(char);
 
 #define PORT  0x3f8
 #ifndef DEBUG
-#define DEBUG 0
+#define DEBUG 1
 #endif
 
 port8BIT dataport(PORT);

Includes/Public_VAR.h

@@ -4,11 +4,16 @@
 inline char* OS_NAME = "SectorOS";
 
 inline char* KERNEL_NAME = "SectorOS";
-inline char* KERNEL_VERSION = "V2.1.3";
-inline char* KERNEL_BUILD = "Build: 2021-12-02";
+inline char* KERNEL_VERSION = "V2.1.4";
+inline char* KERNEL_BUILD = "Build: 2021-12-05";
 inline char* KERNEL_ARCH = "x86";
 
 inline char* SHELL_NAME = "SOSH";
-inline char* SHELL_VER = "V1.0.8";
+inline char* SHELL_VER = "V1.1.2";
+
+// START Environment variables
+inline char* SP[30]; // Shell Prompt
+inline int SPIndex = 0; // Shell Prompt Index
+// END Environment variables
 
 #endif

Makefile

@@ -1,6 +1,7 @@
-GCCPARAMS = -m32 -fno-use-cxa-atexit -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -Wno-write-strings
-ASPARAMS = --32
-LDPARAMS = -melf_i386
+CPP=gcc
+CPPFLAGS = -m32 -fno-use-cxa-atexit -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -Wno-write-strings
+ASFLAGS = --32
+LDFLAGS = -melf_i386
 SHELL = /bin/bash
 GRUB = ~/local/bin
 
@@ -31,15 +32,15 @@ prep:
 
 %.o: %.cpp
 	@printf "\e[1;32m[1/3]Compiling $<\n\e[0m"
-	gcc $(DEBUG) $(GCCPARAMS) -c -o $@ $<
+	$(CPP) $(DEBUG) $(CPPFLAGS) -c -o $@ $<
 
 %.o: %.s
 	@printf "\e[1;32m[1/3]Compiling $<\n\e[0m"
-	as $(ASPARAMS) -o $@ $<
+	as $(ASFLAGS) -o $@ $<
 
 SectorOS_Kernel.bin: LILO/linker.ld $(objects)
 	@printf "\e[1;33m[2/3]Linking object files\n\e[0m"
-	@ld $(LDPARAMS) -T $< -o $@ $(objects)
+	@ld $(LDFLAGS) -T $< -o $@ $(objects)
 	@printf "Linking $(objects) to make $@\n"
 	@printf "Linking finished\n"
 
@@ -80,6 +81,11 @@ runVBOX: SectorOS.iso
 	@(killall VirtualBoxVM && sleep 1) || true
 	VirtualBoxVM --startvm 'SectorOS' --dbg
 
+runBOCHS: SectorOS.iso
+	@printf "Starting Bochs\n";
+	@(killall bochs && sleep 1) || true
+	bochs -q -f bochsrc.txt 
+
 stopVBOX:
 	killall VirtualBoxVM
 

bochsrc

@@ -0,0 +1,3 @@
+ata0-slave: type=cdrom, path=SectorOS.iso, status=inserted
+boot:cdrom
+com1: enabled=1, mode=file, dev=serial.log

bochsrc.txt

@@ -4,6 +4,7 @@
 #include "../Drivers/IOPorts.h"
 #include "../Drivers/Keyboard.h"
 #include "../Includes/multiboot.h"
+#include "../CPU/syscall.h"
 #include "../Drivers/Mouse.h"
 #include "../Drivers/Driver.h"
 #include "../Drivers/RTC.h"
@@ -275,7 +276,7 @@ void printf(char* str)
             case '\3':
                 for(int i = 0; i != 2; i++)
                     x = cursorx;
-                    if (x != 3){
+                    if (x != SPIndex){
                         x--;
                     }
                     VideoMemory[80*y+x] = (VideoMemory[80*y+x] & 0xFF00) | ' ';
@@ -343,15 +344,17 @@ void printf(char* str)
             x = 0;
             y = 0;
             //ColourPrint(0);
-            printf("SectorOS Monolithic kernel       ");
+            printf("SectorOS ");
+            printf(KERNEL_VERSION);
+            printf("                   ");
             RTC rtclock;
             rtclock.read_rtc();
             printf(INTTOCHARPOINT(rtclock.day));
             printf("/");
             printf(INTTOCHARPOINT(rtclock.month));
             printf("/");
             printf(INTTOCHARPOINT(rtclock.year));
-            printf("                         Type: Shell ");
+            printf("                        Type: Shell ");
         }
 
     }
@@ -616,6 +619,8 @@ int do_intel(void)
         printf("\n");
     }
 
+    return 0;
+
 }
 
 void PrintSATA()
@@ -740,6 +745,17 @@ void taskA()
 
 }
 
+void SPOMEMLOC(SerialPort sp)
+{
+    uint16_t value = GetAvailableMem();
+    uint8_t partA = static_cast<uint8_t>((value & 0xFF00) >> 8);
+    uint8_t partB = static_cast<uint8_t>(value & 0x00FF);
+    sp.logToSerialPort("Current memory location: ");
+    sp.logToSerialPort(hertochar(partA));
+    sp.logToSerialPort(" ");
+    sp.logToSerialPort(hertochar(partB));
+}
+
 
 typedef void (*constructor)();
 extern "C" constructor start_ctors;
@@ -759,20 +775,18 @@ extern "C" void kernelMain(const void* multiboot_structure, uint32_t multiboot_m
     printf("Initializing SectorOS Kernel ");printf(KERNEL_VERSION); printf(" "); printf(KERNEL_BUILD); printf("....\n");
     SerialPort sp;
     sp.INITSerial();
-    uint16_t value = GetAvailableMem();
-    uint8_t partA = static_cast<uint8_t>((value & 0xFF00) >> 8);
-    uint8_t partB = static_cast<uint8_t>(value & 0x00FF);
 
-    sp.logToSerialPort("Avaliable Memory = ");
-    sp.logToSerialPort(hertochar(partA));
-    sp.logToSerialPort(" ");
-    sp.logToSerialPort(hertochar(partB));
+    SPOMEMLOC(sp);
     sp.logToSerialPort("\nkernel started");
 
+
+
     GlobalDescriptorTable gdt;
 
     InterruptManager interrupts(0x20, &gdt, &taskManager);
 
+    SyscallHandler syscalls(&interrupts, 0x80);
+
     DriverManager drvmgr;
 
     printf("\nSYSMSG: Initializing Hardwares [Stage 1]...\n");
@@ -831,7 +845,7 @@ extern "C" void kernelMain(const void* multiboot_structure, uint32_t multiboot_m
 
     sp.logToSerialPort("\nInterrupt manager started");
 
-    printf("Welcome to SectorOS Monolithic kernel ");PrintDate();printf("                    Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
+    printf("Welcome to SectorOS ");printf(KERNEL_VERSION);printf("          ");PrintDate();printf("                    Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
 
     printf("Initializing "); printf(SHELL_NAME); printf(" "); printf(SHELL_VER);
 
@@ -845,7 +859,10 @@ extern "C" void kernelMain(const void* multiboot_structure, uint32_t multiboot_m
 
     sp.logToSerialPort("\nKernel initialization surcessful.\nGiving execution access to the kernel.\nAwaiting user input...");
 
-    printf("$: ");
+    SPIndex = 15;
+
+    asm("int $0x80" : : "a" (4), "b" ("root@secos:~#> ")); // Used syscall to print this prompt
+    SPOMEMLOC(sp);
 
     while(1);
 }