Chameleon Commit Details - 2646 - Chameleon open source boot loader project.

Date:

2015-04-14 17:47:26 (9 years 9 days ago)

Author:

ErmaC

Commit:

2646

Parents:

2645

Message:

Revert changes made in commit 2602

Changes:

File differences

-1040
1041 1041
1042 1042
1043 
1043
1044 1044
1045 1045
1046 1046
... ...
1048 1048
1049 1049
1050 1050
1051
+    bb.edx.rr = us & 0xFFFF;␊
    bios(&bb);␊
}␊
␊
/* // reverted from commit 2602␊
void enableA20(void)␊
{␊
    bzero(&bb, sizeof bb);  // Note: may be called before BSS section is initialized␊

    bb.eax.rr = 0x2401;␊
    bios(&bb);␊
}␊
*/␊
 ...
     bb.edx.rr = us & 0xFFFF;␊
     bios(&bb);␊
 }␊
-␊
+/* // reverted from commit 2602␊
 void enableA20(void)␊
 {␊
     bzero(&bb, sizeof bb);  // Note: may be called before BSS section is initialized␊
     bb.eax.rr = 0x2401;␊
     bios(&bb);␊
 }␊
+*/␊

-46
47 47
48 48
49 
49
50 50
51 51
52 52
... ...
108 108
109 109
110 110
111 
111
112 112
113 113
114 114
+␊
#include "libsaio.h"␊
␊
#if UNUSED␊
//#if UNUSED␊
/*␊
 * keyboard controller (8042) I/O port addresses␊
 */␊

    /* wait until done */␊
    flushKeyboardInputBuffer();␊
}␊
#endif /* UNUSED */␊
//#endif /* UNUSED */␊
␊
//==========================================================================␊
// Return the platform name for this hardware.␊
 ...
 ␊
 #include "libsaio.h"␊
 ␊
-#if UNUSED␊
+//#if UNUSED␊
 /*␊
  * keyboard controller (8042) I/O port addresses␊
  */␊
     /* wait until done */␊
     flushKeyboardInputBuffer();␊
 }␊
-#endif /* UNUSED */␊
+//#endif /* UNUSED */␊
 ␊
 //==========================================================================␊
 // Return the platform name for this hardware.␊

-409
410 410
411 411
412
412 413
413 414
414 
415 415
416 416
417 417
+// own things, and then calls common_boot.␊
void boot(int biosdev)␊
{␊
␉initialize_runtime();␊
␉// Enable A20 gate before accessing memory above 1Mb.␊
␉enableA20();␊
␉initialize_runtime();␊
␉common_boot(biosdev);␊
}␊
␊
 // own things, and then calls common_boot.␊
 void boot(int biosdev)␊
 {␊
+␉initialize_runtime();␊
 ␉// Enable A20 gate before accessing memory above 1Mb.␊
 ␉enableA20();␊
-␉initialize_runtime();␊
 ␉common_boot(biosdev);␊
 }␊
 ␊

-75
76 76
77 77
78 
78
79 79
80 80
81 81
+␉zalloc_base         = start ? start : (char *)ZALLOC_ADDR;␊
␉totalNodes          = nodes ? nodes : ZALLOC_NODES;␊
␉zalloced            = (zmem *) zalloc_base;␊
␉zavailable          = (zmem *) (zalloc_base + sizeof(zmem) * totalNodes);␊
␉zavailable          = (zmem *) zalloc_base + sizeof(zmem) * totalNodes;␊
␉zavailable[0].start = (char *)zavailable + sizeof(zmem) * totalNodes;␊
␊
␉if (size == 0)␊
 ␉zalloc_base         = start ? start : (char *)ZALLOC_ADDR;␊
 ␉totalNodes          = nodes ? nodes : ZALLOC_NODES;␊
 ␉zalloced            = (zmem *) zalloc_base;␊
-␉zavailable          = (zmem *) (zalloc_base + sizeof(zmem) * totalNodes);␊
+␉zavailable          = (zmem *) zalloc_base + sizeof(zmem) * totalNodes;␊
 ␉zavailable[0].start = (char *)zavailable + sizeof(zmem) * totalNodes;␊
 ␊
 ␉if (size == 0)␊