Browse Source

Rename _rom_size to _load_size_sect, since hdprefix.S also uses it.

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
0929142a15

+ 1
- 1
src/arch/i386/prefix/hdprefix.S View File

59
 	ljmp	$BOOT_SEG, $start_image
59
 	ljmp	$BOOT_SEG, $start_image
60
 
60
 
61
 load_length:
61
 load_length:
62
-	.long	_rom_size
62
+	.long	_load_size_sect
63
 max_sector:
63
 max_sector:
64
 	.byte	0
64
 	.byte	0
65
 max_head:
65
 max_head:

+ 2
- 2
src/arch/i386/prefix/romprefix.S View File

14
 	.org	0x00
14
 	.org	0x00
15
 romheader:
15
 romheader:
16
 	.word	0xAA55			/* BIOS extension signature */
16
 	.word	0xAA55			/* BIOS extension signature */
17
-romheader_size:	.byte	_rom_size	/* Size in 512-byte blocks */
17
+romheader_size:	.byte _load_size_sect	/* Size in 512-byte blocks */
18
 	jmp	init_vector		/* Initialisation vector */
18
 	jmp	init_vector		/* Initialisation vector */
19
 	.org	0x16
19
 	.org	0x16
20
 	.word	undiheader
20
 	.word	undiheader
34
 	.byte	0x02			/* Device Base Type code */
34
 	.byte	0x02			/* Device Base Type code */
35
 	.byte	0x00			/* Device Sub-Type code */
35
 	.byte	0x00			/* Device Sub-Type code */
36
 	.byte	0x00			/* Device Interface Type code */
36
 	.byte	0x00			/* Device Interface Type code */
37
-pciheader_size:	.word	_rom_size	/* Image length same as offset 02h */
37
+pciheader_size:	.word _load_size_sect	/* Image length same as offset 02h */
38
 	.word	0x0001			/* revision level of code/data */
38
 	.word	0x0001			/* revision level of code/data */
39
 	.byte	0x00			/* code type */
39
 	.byte	0x00			/* code type */
40
 	.byte	0x80			/* Flags (last PCI data structure) */
40
 	.byte	0x80			/* Flags (last PCI data structure) */

+ 1
- 1
src/arch/i386/scripts/i386-kir.lds View File

192
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
192
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
193
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
193
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
194
     _load_size_pgh	= ( ( _load_size + 15 ) / 16 );
194
     _load_size_pgh	= ( ( _load_size + 15 ) / 16 );
195
-    _rom_size		= ( ( _load_size + 511 ) / 512 );
195
+    _load_size_sect	= ( ( _load_size + 511 ) / 512 );
196
 }
196
 }

+ 1
- 1
src/arch/i386/scripts/i386.lds View File

270
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
270
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
271
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
271
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
272
     _load_size_pgh	= ( ( _load_size + 15 ) / 16 );
272
     _load_size_pgh	= ( ( _load_size + 15 ) / 16 );
273
-    _rom_size		= ( ( _load_size + 511 ) / 512 );
273
+    _load_size_sect	= ( ( _load_size + 511 ) / 512 );
274
 }
274
 }

Loading…
Cancel
Save