Chameleon

Chameleon Commit Details

Date:2011-08-05 05:08:19 (7 years 11 months ago)
Author:Evan Lojewski
Commit:1275
Parents: 1274
Message:Remove unused file. Fixup makefiles some more - boot2 compiles again.
Changes:
D/branches/xZenu/src/arch/i386/boot2/multiboot.h
M/branches/xZenu/src/modules/Makefile
M/branches/xZenu/src/arch/i386/boot2/Makefile

File differences

branches/xZenu/src/modules/Makefile
5252
5353
5454
55
55
5656
5757
5858
$(SYMROOT)/boot_modules.c: $(SYMROOT) $(OBJROOT) ${SYMROOT}/modules/ ${OBJROOT} $(addprefix $(OBJROOT)/, ${MODULE_OBJS})
ifeq ($(BUILT_IN),yes)
@echo "// Autogenerated - do not modify" > $@
@echo "#include \"../../i386/modules/ModuleSystem/include/modules.h\"" >> $@
@echo "#include \"../../src/modules/ModuleSystem/include/modules.h\"" >> $@
@echo "#include \"boot_modules.h\"" >> $@
@echo "void start_built_in_modules() {" >> $@
endif
branches/xZenu/src/arch/i386/boot2/multiboot.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
/*$NetBSD: multiboot.h,v 1.4 2006/10/25 13:56:16 jmmv Exp $*/
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Julio M. Merino Vidal.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
*This product includes software developed by the NetBSD
*Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/* Modified by David Elliott <dfe@cox.net> on 2007/06/27
- Removed checks for KERNEL define
- Replaced _LOCORE def check with __ASSEMBLER__ def check
- Removed prototypes for C functions we don't have
- Replaced all paddr_t and vaddr_t types with uint32_t and a comment
*/
/* --------------------------------------------------------------------- */
/*
* Multiboot header structure.
*/
#define MULTIBOOT_HEADER_MAGIC0x1BADB002
#define MULTIBOOT_HEADER_MODS_ALIGNED0x00000001
#define MULTIBOOT_HEADER_WANT_MEMORY0x00000002
#define MULTIBOOT_HEADER_HAS_VBE0x00000004
#define MULTIBOOT_HEADER_HAS_ADDR0x00010000
#if !defined(__ASSEMBLER__)
struct multiboot_header {
uint32_tmh_magic;
uint32_tmh_flags;
uint32_tmh_checksum;
/* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_ADDR. */
uint32_tmh_header_addr; /* paddr_t */
uint32_tmh_load_addr; /* paddr_t */
uint32_tmh_load_end_addr; /* paddr_t */
uint32_tmh_bss_end_addr; /* paddr_t */
uint32_tmh_entry_addr; /* paddr_t */
/* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. */
uint32_tmh_mode_type;
uint32_tmh_width;
uint32_tmh_height;
uint32_tmh_depth;
};
#endif /* !defined(__ASSEMBLER__) */
/*
* Symbols defined in locore.S.
*/
#if !defined(__ASSEMBLER__)
extern struct multiboot_header *Multiboot_Header;
#endif /* !defined(__ASSEMBLER__) */
/* --------------------------------------------------------------------- */
/*
* Multiboot information structure.
*/
#define MULTIBOOT_INFO_MAGIC0x2BADB002
#define MULTIBOOT_INFO_HAS_MEMORY0x00000001
#define MULTIBOOT_INFO_HAS_BOOT_DEVICE0x00000002
#define MULTIBOOT_INFO_HAS_CMDLINE0x00000004
#define MULTIBOOT_INFO_HAS_MODS0x00000008
#define MULTIBOOT_INFO_HAS_AOUT_SYMS0x00000010
#define MULTIBOOT_INFO_HAS_ELF_SYMS0x00000020
#define MULTIBOOT_INFO_HAS_MMAP0x00000040
#define MULTIBOOT_INFO_HAS_DRIVES0x00000080
#define MULTIBOOT_INFO_HAS_CONFIG_TABLE0x00000100
#define MULTIBOOT_INFO_HAS_LOADER_NAME0x00000200
#define MULTIBOOT_INFO_HAS_APM_TABLE0x00000400
#define MULTIBOOT_INFO_HAS_VBE0x00000800
#if !defined(__ASSEMBLER__)
struct multiboot_info {
uint32_tmi_flags;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_MEMORY. */
uint32_tmi_mem_lower;
uint32_tmi_mem_upper;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_BOOT_DEVICE. */
uint8_tmi_boot_device_part3;
uint8_tmi_boot_device_part2;
uint8_tmi_boot_device_part1;
uint8_tmi_boot_device_drive;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_CMDLINE. */
char *mi_cmdline;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_MODS. */
uint32_tmi_mods_count;
uint32_tmi_mods_addr; /* vaddr_t */
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_{AOUT,ELF}_SYMS. */
uint32_tmi_elfshdr_num;
uint32_tmi_elfshdr_size;
uint32_tmi_elfshdr_addr; /* vaddr_t */
uint32_tmi_elfshdr_shndx;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_MMAP. */
uint32_tmi_mmap_length;
uint32_tmi_mmap_addr; /* vaddr_t */
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_DRIVES. */
uint32_tmi_drives_length;
uint32_tmi_drives_addr; /* vaddr_t */
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_CONFIG_TABLE. */
void *unused_mi_config_table;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_LOADER_NAME. */
char *mi_loader_name;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_APM. */
void *unused_mi_apm_table;
/* Valid if mi_flags sets MULTIBOOT_INFO_HAS_VBE. */
void *unused_mi_vbe_control_info;
void *unused_mi_vbe_mode_info;
uint32_tunused_mi_vbe_interface_seg; /* paddr_t */
uint32_tunused_mi_vbe_interface_off; /* paddr_t */
uint32_tunused_mi_vbe_interface_len;
};
typedef struct multiboot_info multiboot_info;
/* --------------------------------------------------------------------- */
struct multiboot_module {
uint32_tmm_mod_start;
uint32_tmm_mod_end;
char *mm_string;
uint32_tmm_reserved;
};
typedef struct multiboot_module multiboot_module;
/*
* Drive information. This describes an entry in the drives table as
* pointed to by mi_drives_addr.
*/
struct multiboot_drive {
uint32_tmd_length;
uint8_tmd_number;
uint8_tmd_mode;
uint16_tmd_cylinders;
uint8_tmd_heads;
uint8_tmd_sectors;
/* The variable-sized 'ports' field comes here, so this structure
* can be longer. */
};
/* --------------------------------------------------------------------- */
/*
* Memory mapping. This describes an entry in the memory mappings table
* as pointed to by mi_mmap_addr.
*
* Be aware that mm_size specifies the size of all other fields *except*
* for mm_size. In order to jump between two different entries, you
* have to count mm_size + 4 bytes.
*/
struct multiboot_mmap {
uint32_tmm_size;
uint64_tmm_base_addr;
uint64_tmm_length;
uint32_tmm_type;
};
#endif /* !defined(__ASSEMBLER__) */
/* --------------------------------------------------------------------- */
branches/xZenu/src/arch/i386/boot2/Makefile
3232
3333
3434
35
35
36
37
38
3639
3740
3841
OTHER_FILES =
OBJECTS = boot2 boot
# enable boot2 to find boot_modules.c
VPATH = $(ROOT)/sym/modules/
OBJECTS = boot2 boot boot_modules
#boot_modules
DIRS_NEEDED =

Archive Download the corresponding diff file

Revision: 1275