diff options
| author | Michael Brown | 2005-05-24 01:47:54 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-05-24 01:47:54 +0200 |
| commit | 7b423c098838fb4b972ac888ac6f94efda951765 (patch) | |
| tree | c55dbb81000afe6e556caf9004ff830116117c36 /src/arch | |
| parent | Split PXE code into preboot, udp, tftp, undi and loader units. (diff) | |
| download | ipxe-7b423c098838fb4b972ac888ac6f94efda951765.tar.gz ipxe-7b423c098838fb4b972ac888ac6f94efda951765.tar.xz ipxe-7b423c098838fb4b972ac888ac6f94efda951765.zip | |
Fixes for gcc >= 3.2 from Georg Baum
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/firmware/pcbios/basemem.c | 8 | ||||
| -rw-r--r-- | src/arch/i386/include/basemem.h | 2 | ||||
| -rw-r--r-- | src/arch/i386/include/librm.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/i386/firmware/pcbios/basemem.c index 0bc9ca98..7dad640e 100644 --- a/src/arch/i386/firmware/pcbios/basemem.c +++ b/src/arch/i386/firmware/pcbios/basemem.c @@ -130,8 +130,8 @@ void free_base_memory ( void *ptr, size_t size ) { */ for ( ; size_kb > 0 ; free_block++, size_kb-- ) { /* Mark this block as unused */ - free_block->magic = FREE_BLOCK_MAGIC; - free_block->size_kb = size_kb; + free_block->header.magic = FREE_BLOCK_MAGIC; + free_block->header.size_kb = size_kb; } /* Free up unused base memory */ @@ -161,12 +161,12 @@ static void free_unused_base_memory ( void ) { * if this is not a free block */ if ( ( fbms == FBMS_MAX ) || - ( free_block->magic != FREE_BLOCK_MAGIC ) ) { + ( free_block->header.magic != FREE_BLOCK_MAGIC ) ) { break; } /* Return memory to BIOS */ - fbms += free_block->size_kb; + fbms += free_block->header.size_kb; DBG ( "Freed %d kB of base memory at [%hx:0000,%hx:0000), " "%d kB now free\n", diff --git a/src/arch/i386/include/basemem.h b/src/arch/i386/include/basemem.h index 6e7c22dd..289824eb 100644 --- a/src/arch/i386/include/basemem.h +++ b/src/arch/i386/include/basemem.h @@ -19,7 +19,7 @@ struct free_base_memory_header { }; union free_base_memory_block { - struct free_base_memory_header; + struct free_base_memory_header header; char bytes[1024]; }; diff --git a/src/arch/i386/include/librm.h b/src/arch/i386/include/librm.h index 2edc1096..1b82a982 100644 --- a/src/arch/i386/include/librm.h +++ b/src/arch/i386/include/librm.h @@ -17,8 +17,8 @@ /* Real-mode call parameter block, as passed to real_call */ struct real_call_params { - struct i386_seg_regs; - struct i386_regs; + struct i386_seg_regs segs; + struct i386_regs regs; segoff_t rm_code; segoff_t reserved; } PACKED; |