* Added cursor in the shell

Author: Arun007coder

CPU/PowerControl.cpp

@@ -1,5 +1,6 @@
 #include "PowerControl.h"
 
+extern uint32_t shutdown();
 
 void PowerControl::reboot()
 {
@@ -25,4 +26,9 @@ bool PowerControl::getPowerState()
 {
     port8BIT pt(0xB0);
     return pt.ReadFromPort() & 0x01;
+}
+
+void PowerControl::shutdown()
+{
+    shutdown();
 }

CPU/PowerControl.h

@@ -13,6 +13,7 @@ class PowerControl
     void halt();
     //If running in virtualBox. This function will Stop virtualBox
     void StopVirtualBox();
+    void shutdown(); //!: This function is not implemented yet
 
     //To get the current power state
     bool getPowerState();

CPU/shutdown.asm

@@ -0,0 +1,29 @@
+[BITS 32]
+
+global shutdown
+
+section .data
+
+section .text
+
+shutdown:
+    push edi
+    push ebx
+wait_gate1:
+    in al,64h
+    and al,2
+    jnz wait_gate1
+    mov al,0D1h
+    out 64h,al
+wait_gate2:
+    in al,64h
+    and al,2
+    jnz wait_gate2
+    mov al,0FEh
+    out 60h,al
+;
+    xor eax,eax
+    mov cr3,eax
+
+reset_wait:
+    jmp reset_wait

Drivers/Keyboard.cpp

@@ -1,7 +1,7 @@
 #include "Keyboard.h"
 
 static bool isCTRLed = false;
-
+bool canNewLine = true;
 
 bool isUSRChanged = false;
 void printf(char *);
@@ -88,7 +88,7 @@ void KeyboardDriver::activate()
 uint32_t KeyboardDriver::HandleInterrupt(uint32_t esp)
 {
     esp2 = esp;
-    
+
     if(isESPChanged)
     {
         printf("\n");
@@ -348,6 +348,7 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
             printf("                   ");
             PrintDate();
             printf("                        Type: Shell ");
+            canNewLine = false;
         }
         else if (key_buffer[0] == "s" & key_buffer[1] == "d")
         {
@@ -518,17 +519,27 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
                 }
             }
         }
+        else if (key_buffer[0] == "e" && key_buffer[1] == "x" && key_buffer[2] == "i" && key_buffer[3] == "t")
+        {
+            //power.shutdown();
+        }
         else
         {
-            printf("Unknown Command. Type help in console to get all the commands");
+            printf("Unknown Command \"");
+            for (int i = 0; key_buffer[i] != "\n"; i++)
+            {
+                printf(key_buffer[i]);
+            }
+            printf("\". Type help in console to get all the commands");
         }
         if(!isTxtMode){
-            printf("\n");
+            if (canNewLine)
+                printf("\n");
             for (int i = 0; SPIndex > i; i++)
             {
                 printf(SP[i]);
             }
-            
+            canNewLine = true;
         }
         serialport.logToSerialPort("Command interpreter got a command :- "); serialport.logToSerialPort(COMNAME); serialport.logToSerialPort("\n");
         clear_key_buffer();

Filesystem/FATFS.cpp

@@ -46,13 +46,13 @@ void ReadBiosBlock(AdvancedTechnologyAttachment *hd, uint32_t partitionOffset)
 
             if (lst_dir2 == (char*)dirent[i].name)
             {
-                continue;
+                printf("X");
             }
             else
             {
                 if (lst_dir == (char *)dirent[i].name)
                 {
-                    continue;
+                    printf("Y");
                 }
                 else
                 {

Include/Public_VAR.h

@@ -5,7 +5,7 @@ inline char* OS_NAME = "SectorOS";
 
 inline char* KERNEL_NAME = "SectorOS";
 inline char* KERNEL_VERSION = "V2.2.2";
-inline char* KERNEL_BUILD = "Build: 2022-01-07";
+inline char* KERNEL_BUILD = "Build: 2022-01-08";
 inline char* KERNEL_ARCH = "x86";
 
 inline char* SHELL_NAME = "SOSH";

Makefile

@@ -1,6 +1,8 @@
 CPP=gcc
 AS=as
 LD=ld
+ASM=nasm
+ASMFLAGS= -f elf
 CPPFLAGS = -m32 -fno-use-cxa-atexit -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -Wno-write-strings
 ASFLAGS = --32
 LDFLAGS = -melf_i386
@@ -33,6 +35,9 @@ prep:
 	@printf "Preparing...\n"
 	@sudo apt-get install xorriso mtools grub-pc-bin
 
+CPU/PowerControl.o: CPU/PowerControl.cpp CPU/shutdown.o
+	$(CPP) $(CPPFLAGS) -c -o $@ CPU/PowerControl.cpp CPU/shutdown.o
+
 %.o: %.cpp
 	@printf "\e[1;32m[1/3]Compiling $<\n\e[0m"
 	$(CPP) $(DEBUG) $(CPPFLAGS) -c -o $@ $<
@@ -41,6 +46,10 @@ prep:
 	@printf "\e[1;32m[1/3]Compiling $<\n\e[0m"
 	$(AS) $(ASFLAGS) -o $@ $<
 
+%.o: %.asm
+	@printf "\e[1;32m[1/3]Compiling $<\n\e[0m"
+	$(ASM) $(ASMFLAGS) -o $@ $<
+
 SectorOS_Kernel.bin: LILO/linker.ld $(objects)
 	@printf "\e[1;33m[2/3]Linking object files\n\e[0m"
 	@$(LD) $(LDFLAGS) -T $< -o $@ $(objects)

kernel/kernel.cpp

@@ -5,6 +5,7 @@
 #include "../Drivers/Keyboard.h"
 #include "../Shell/Shell.h"
 #include "../Include/multiboot.h"
+#include "../Hardcom/SerialPort.h"
 #include "../CPU/syscall.h"
 #include "../Drivers/Mouse.h"
 #include "../Drivers/Driver.h"
@@ -525,6 +526,32 @@ char *INTTOCHARPOINT(int num)
     return res;
 }
 
+void enable_cursor(uint8_t cursor_start, uint8_t cursor_end)
+{
+    port8BIT P1(0x3D4);
+    port8BIT P2(0x3D5);
+
+    P1.WriteToPort(0x0A);
+    P2.WriteToPort((P2.ReadFromPort() & 0xC0) | cursor_start);
+
+    P1.WriteToPort(0x0B);
+    P2.WriteToPort((P2.ReadFromPort() & 0xE0) | cursor_end);
+}
+
+void update_cursor(int x, int y)
+{
+    int VGA_WIDTH = 80;
+    port8BIT P1(0x3D4);
+    port8BIT P2(0x3D5);
+
+    uint16_t pos = y * VGA_WIDTH + x;
+
+    P1.WriteToPort(0x0F);
+    P2.WriteToPort((uint8_t)(pos & 0xFF));
+    P1.WriteToPort(0x0E);
+    P2.WriteToPort((uint8_t)((pos >> 8) & 0xFF));
+}
+
 uint16_t GetAvailableMem()
 {
     port8BIT port(0x70);
@@ -693,6 +720,8 @@ void printf(char *str)
             printf("                        Type: Shell ");
         }
     }
+
+    update_cursor(x, y + 1);
 }
 
 // Uses 10 Character Space
@@ -790,6 +819,8 @@ void printfchar(char st)
         x = 0;
         y = 0;
     }
+
+    update_cursor(x, y + 1);
 }
 
 void printHex(uint8_t Key)
@@ -828,9 +859,7 @@ void PrintMEM(const void *multiboot_structure)
     printf("\n");
 }
 
-#define cpuid(in, a, b, c, d) __asm__("cpuid"                              \
-                                      : "=a"(a), "=b"(b), "=c"(c), "=d"(d) \
-                                      : "a"(in));
+#define cpuid(in, a, b, c, d) __asm__("cpuid"        : "=a"(a), "=b"(b), "=c"(c), "=d"(d): "a"(in));
 
 int do_intel(void)
 {
@@ -1074,6 +1103,7 @@ extern "C" void callConstructors()
 
 extern "C" void kernelMain(const void *multiboot_structure, uint32_t multiboot_m)
 {
+    enable_cursor(0, 0);
     TaskManager taskManager;
     uint32_t mm = multiboot_m;
     printf("Initializing SectorOS Kernel ");
@@ -1138,7 +1168,7 @@ extern "C" void kernelMain(const void *multiboot_structure, uint32_t multiboot_m
     printf(KERNEL_VERSION);
     printf("          ");
     PrintDate();
-    printf("                    Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
+    printf("                      Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
 
     printf("Initializing ");
     printf(SHELL_NAME);