Преглед на файлове

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

tags/v0.9.3
Michael Brown преди 17 години
родител
ревизия
0929142a15
променени са 4 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 1
    1
      src/arch/i386/prefix/hdprefix.S
  2. 2
    2
      src/arch/i386/prefix/romprefix.S
  3. 1
    1
      src/arch/i386/scripts/i386-kir.lds
  4. 1
    1
      src/arch/i386/scripts/i386.lds

+ 1
- 1
src/arch/i386/prefix/hdprefix.S Целия файл

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

+ 2
- 2
src/arch/i386/prefix/romprefix.S Целия файл

@@ -14,7 +14,7 @@
14 14
 	.org	0x00
15 15
 romheader:
16 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 18
 	jmp	init_vector		/* Initialisation vector */
19 19
 	.org	0x16
20 20
 	.word	undiheader
@@ -34,7 +34,7 @@ pciheader:
34 34
 	.byte	0x02			/* Device Base Type code */
35 35
 	.byte	0x00			/* Device Sub-Type code */
36 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 38
 	.word	0x0001			/* revision level of code/data */
39 39
 	.byte	0x00			/* code type */
40 40
 	.byte	0x80			/* Flags (last PCI data structure) */

+ 1
- 1
src/arch/i386/scripts/i386-kir.lds Целия файл

@@ -192,5 +192,5 @@ SECTIONS {
192 192
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
193 193
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
194 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 Целия файл

@@ -270,5 +270,5 @@ SECTIONS {
270 270
     _text16_size_pgh	= ( ( _text16_size + 15 ) / 16 );
271 271
     _data16_size_pgh	= ( ( _data16_size + 15 ) / 16 );
272 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…
Отказ
Запис