Remove temporary "multiEnable" boolean and "multi" command. Multi-tasking is working well enough that they aren't needed. Also, "single-tasking" had regressed and wasn't working.

(Apps can be run without task-switching with the "run exclusive" command from the command shell.)

Author: tthomps

MyOS_1/Build_Number.h

@@ -3,4 +3,4 @@
 // Define a build number. This number will be incremented by a simple console program called by a post-build event
 // It's put here in its own file to keep the other program from messing up the source
 #define \
-BUILD_NUMBER 6461
+BUILD_NUMBER 6464

MyOS_1/Console_Shell.c

@@ -969,14 +969,6 @@ void Shell_Process_command(void)
         return;
     }
 
-    // Temporary command to enable multi-tasking
-    if (strcmp(currentCommand, "multi") == 0)
-    {
-        kprintf("Enabling multi-tasking...\n");
-        multiEnable = true;
-        return;
-    }
-
     // Runhi command - used to load GUI at a different memory address than other programs, mapped into kernel space
     memset(subCommand, 0, MAX_COMMAND_LENGTH);
     strncpy(subCommand, currentCommand, strlen("runhi"));

MyOS_1/Executables/PE32.c

@@ -175,33 +175,8 @@ bool loadAndRunPE(uint8_t *executableDestination, DOS_Header *mzAddress, const c
         terminal_newline();
     }
 
-    if (multiEnable)
-    {
-        DispatchNewTask((uint32_t)entryPoint, newPageDirectory, 0x20000, imageName, exclusive);
-    }
-    else
-    {   
-        // Re-enable interrupts
-        _enable();
-
-        /*_asm {
-            // Setup the program's stack
-            mov [espVal], esp
-            mov esp, 0x440000
-            pushad
-        }*/
-        // This is where the exit() system call will return to. If setjmp() doesn't return 0, then the executable used exit().
-        if (setjmp(peReturnBuf) == 0)
-        {
-            // run the program
-            (*entryPoint)();
-        }
-        /*_asm
-        {
-            popad
-            mov esp, [espVal]
-        }*/
-    }
+    // Run it!
+    DispatchNewTask((uint32_t)entryPoint, newPageDirectory, 0x20000, imageName, exclusive);
 
     if (debugLevel)
     {

MyOS_1/Tasks/Context.h

@@ -57,8 +57,6 @@ extern int currentTask;
 
 extern uint32_t nextPID;
 
-extern bool multiEnable; // TEMPTEMP
-
 void CloseApp(uint32_t PID);
 
 void DispatchNewTask(uint32_t programStart, PAGE_DIRECTORY_ENTRY *newPageDirectory, uint32_t stackSize, const char *imageName, bool exclusive);

MyOS_1/Tasks/Dispatcher.c

@@ -283,7 +283,6 @@ void ExitApp()
     // Make sure interrupts are disabled
     _disable();
 
-    // TODO: handle multiEnable = false
     // If the ready-queue is empty or contains only this task, 
     // or if we're not running in multitasking mode, there's nothing we can do here
     if (!readyQueueHead || (!readyQueueHead->nextEntry && readyQueueHead->taskIndex == currentTask))

MyOS_1/Timers/PIT.c

@@ -63,7 +63,7 @@ void PIT_Set_Interval(uint32_t hz)
 uint32_t espVal;
 uint32_t oldTaskIndex;
 READY_QUEUE_ENTRY *oldHead;
-bool multiEnable = false;   // TEMPTEMP HACKHACK
+
 // Interrupt handler for the PIT
 void _declspec(naked) timer_interrupt_handler(void)
 {
@@ -82,7 +82,7 @@ void _declspec(naked) timer_interrupt_handler(void)
     if (!tasks[currentTask].exclusive && readyQueueHead)
     {
         --ticksLeftInTask;
-        if (ticksLeftInTask <= 0 && multiEnable)
+        if (ticksLeftInTask <= 0)
         {
             if(debugLevel)
                 kprintf("Saving %s.", tasks[currentTask].imageName);