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

Date:

2015-03-10 06:55:49 (9 years 1 month ago)

Author:

ErmaC

Commit:

2602

Parents:

2601

Message:

Fix bug in malloc_init, use bios for enableA20() (Merge from Zenith432 branch)

Changes:

M	/trunk/i386/boot2/boot.c
M	/trunk/i386/libsaio/misc.c
M	/trunk/CHANGES
M	/trunk/i386/libsa/zalloc.c
M	/trunk/i386/libsaio/saio_internal.h
M	/trunk/i386/libsaio/biosfn.c

File differences

-1042
1043 1043
1044 1044
1045
1046
1047
1048
1049
1050
1051
+    bios(&bb);␊
}␊
␊
void enableA20(void)␊
{␊
    bzero(&bb, sizeof bb);  // Note: may be called before BSS section is initialized␊
    bb.intno = 0x15;␊
    bb.eax.rr = 0x2401;␊
    bios(&bb);␊
}␊
     bios(&bb);␊
 }␊
 ␊
+void enableA20(void)␊
+{␊
+    bzero(&bb, sizeof bb);  // Note: may be called before BSS section is initialized␊
+    bb.intno = 0x15;␊
+    bb.eax.rr = 0x2401;␊
+    bios(&bb);␊
+}␊

-72
73 73
74 74
75
75 76
76 77
77 78
... ...
137 138
138 139
139 140
140 
141 141
142 142
143 143
+extern unsigned long getExtendedMemorySize();␊
extern unsigned long getConventionalMemorySize();␊
extern void   sleep(int n);␊
extern void   enableA20(void);␊
␊
/* bootstruct.c */␊
extern void   initKernBootStruct(void);␊

long AllocateMemoryRange(char *rangeName, long start, long length, long type);␊
␊
/* misc.c */␊
extern void   enableA20(void);␊
extern int    checkForSupportedHardware();␊
extern int␉  isLaptop();␊
extern void   getPlatformName(char *nameBuf);␊
 ...
 extern unsigned long getExtendedMemorySize();␊
 extern unsigned long getConventionalMemorySize();␊
 extern void   sleep(int n);␊
+extern void   enableA20(void);␊
 ␊
 /* bootstruct.c */␊
 extern void   initKernBootStruct(void);␊
 long AllocateMemoryRange(char *rangeName, long start, long length, long type);␊
 ␊
 /* misc.c */␊
-extern void   enableA20(void);␊
 extern int    checkForSupportedHardware();␊
 extern int␉  isLaptop();␊
 extern void   getPlatformName(char *nameBuf);␊

-420
421 421
422 422
423 
424 423
425 424
425
426 426
427 427
428 428
+// 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)␊

-
2
1 3
2 4
3 5
+- Zenith432 : Fix bug in malloc_init, use bios for enableA20()␊
- meklort : Slightly improve decive selection name - add os version.␊
- Zenith432 : Interrupt Management␊
- Bungo : Added ability to auto-select last booted partition as the boot volume.␊
- Bungo : Added MacOSVerCurrent and MacOSVer2Int function to use instead of macros.␊
+- Zenith432 : Fix bug in malloc_init, use bios for enableA20()␊
+- meklort : Slightly improve decive selection name - add os version.␊
 - Zenith432 : Interrupt Management␊
 - Bungo : Added ability to auto-select last booted partition as the boot volume.␊
 - Bungo : Added MacOSVerCurrent and MacOSVer2Int function to use instead of macros.␊