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

Date:

2017-03-23 01:15:34 (7 years 1 month ago)

Author:

ErmaC

Commit:

2851

Parents:

2850

Message:

Handle macro definition for boot.c/cpu.c/hda.c from config.h

Changes:

M	/branches/ErmaC/Enoch/i386/libsaio/hda.c
M	/branches/ErmaC/Enoch/i386/boot2/config.h
M	/branches/ErmaC/Enoch/i386/boot2/boot.c
M	/branches/ErmaC/Enoch/i386/libsaio/cpu.c

File differences

-4
5 5
6 6
7
7 8
8 9
9 10
10 11
11 12
12 13
13 
14 
15 
16 
17 14
18 15
19 16
+ * Bronya:   2015 Improve AMD support, cleanup and bugfix␊
 */␊
␊
#include "config.h"␊
#include "libsaio.h"␊
#include "platform.h"␊
#include "cpu.h"␊
#include "bootstruct.h"␊
#include "boot.h"␊
␊
#ifndef DEBUG_CPU␊
␉#define DEBUG_CPU 0␊
#endif␊
␊
#if DEBUG_CPU␊
␉#define DBG(x...)␉␉printf(x)␊
#else␊
  * Bronya:   2015 Improve AMD support, cleanup and bugfix␊
  */␊
 ␊
+#include "config.h"␊
 #include "libsaio.h"␊
 #include "platform.h"␊
 #include "cpu.h"␊
 #include "bootstruct.h"␊
 #include "boot.h"␊
 ␊
-#ifndef DEBUG_CPU␊
-␉#define DEBUG_CPU 0␊
-#endif␊
-␊
 #if DEBUG_CPU␊
 ␉#define DBG(x...)␉␉printf(x)␊
 #else␊

-9
10 10
11 11
12
13
14
12 15
16
17
18
19
20
21
22
13 23
+#ifndef config_h␊
#define config_h␊
␊
////////////////////////////////// boot.c␊
#define DEBUG_BOOT2 0␊
#define DEBUG_INTERRUPTS 0␊
␊
////////////////////////////////// cpu.c␊
#define DEBUG_CPU 0␊
␊
////////////////////////////////// hda.c␊
#define DEBUG_HDA 0␊
#define DEBUG_CODEC 0␊
␊
#endif /* config_h */␊
 #ifndef config_h␊
 #define config_h␊
 ␊
+////////////////////////////////// boot.c␊
+#define DEBUG_BOOT2 0␊
+#define DEBUG_INTERRUPTS 0␊
 ␊
+////////////////////////////////// cpu.c␊
+#define DEBUG_CPU 0␊
+␊
+////////////////////////////////// hda.c␊
+#define DEBUG_HDA 0␊
+#define DEBUG_CODEC 0␊
+␊
 #endif /* config_h */␊

-45
46 46
47 47
48
48 49
49 50
50 51
... ...
56 57
57 58
58 59
59 
60 
61 
62 60
63 
64 
65 
66 
67 61
68 62
69 63
+ * Reworked again by Curtis Galloway (galloway@NeXT.com)␊
 */␊
␊
#include "config.h"␊
#include "boot.h"␊
#include "bootstruct.h"␊
#include "fake_efi.h"␊

#include "modules.h"␊
#include "device_tree.h"␊
␊
#ifndef DEBUG_BOOT2␊
␉#define DEBUG_BOOT2 0␊
#endif␊
␊
#ifndef DEBUG_INTERRUPTS␊
␉#define DEBUG_INTERRUPTS 0␊
#endif␊
␊
#if DEBUG_BOOT2␊
␉#define DBG(x...)␉printf(x)␊
#else␊
 ...
  * Reworked again by Curtis Galloway (galloway@NeXT.com)␊
  */␊
 ␊
+#include "config.h"␊
 #include "boot.h"␊
 #include "bootstruct.h"␊
 #include "fake_efi.h"␊
 #include "modules.h"␊
 #include "device_tree.h"␊
 ␊
-#ifndef DEBUG_BOOT2␊
-␉#define DEBUG_BOOT2 0␊
-#endif␊
 ␊
-#ifndef DEBUG_INTERRUPTS␊
-␉#define DEBUG_INTERRUPTS 0␊
-#endif␊
-␊
 #if DEBUG_BOOT2␊
 ␉#define DBG(x...)␉printf(x)␊
 #else␊