sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-10 23:48:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Remove PACKED macro

Browse Source 
Most of iPXE uses __attribute__((packed)) anyway, and PACKED conflicts
with an identically-named macro in the upstream EFI header files.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2010-05-29 16:51:48 +01:00
parent eef46c23d6
commit 307b39c08c
6 changed files with 70 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/arch/i386/include/registers.h
View File

@@ -28,9 +28,9 @@ typedef union {
uint8_t byte;
};
uint8_t h;
} PACKED;
} __attribute__ (( packed ));
uint16_t word;
} PACKED reg16_t;
} __attribute__ (( packed )) reg16_t;
/**
* A 32-bit general register.
@@ -46,10 +46,10 @@ typedef union {
uint8_t byte;
};
uint8_t h;
} PACKED;
} __attribute__ (( packed ));
uint16_t word;
uint32_t dword;
} PACKED reg32_t;
} __attribute__ (( packed )) reg32_t;
/**
* A 32-bit general register dump.
@@ -80,7 +80,7 @@ struct i386_regs {
struct {
uint8_t bl;
uint8_t bh;
} PACKED;
} __attribute__ (( packed ));
uint16_t bx;
uint32_t ebx;
};
@@ -88,7 +88,7 @@ struct i386_regs {
struct {
uint8_t dl;
uint8_t dh;
} PACKED;
} __attribute__ (( packed ));
uint16_t dx;
uint32_t edx;
};
@@ -96,7 +96,7 @@ struct i386_regs {
struct {
uint8_t cl;
uint8_t ch;
} PACKED;
} __attribute__ (( packed ));
uint16_t cx;
uint32_t ecx;
};
@@ -104,11 +104,11 @@ struct i386_regs {
struct {
uint8_t al;
uint8_t ah;
} PACKED;
} __attribute__ (( packed ));
uint16_t ax;
uint32_t eax;
};
} PACKED;
} __attribute__ (( packed ));
/**
* A segment register dump.
@@ -142,7 +142,7 @@ struct i386_seg_regs {
uint16_t es;
uint16_t fs;
uint16_t gs;
} PACKED;
} __attribute__ (( packed ));
/**
* A full register dump.
@@ -175,7 +175,7 @@ struct i386_all_regs {
struct i386_seg_regs segs;
struct i386_regs regs;
uint32_t flags;
} PACKED;
} __attribute__ (( packed ));
/* Flags */
#define CF ( 1 << 0 )
@@ -191,7 +191,7 @@ struct i386_all_regs {
struct segoff {
uint16_t offset;
uint16_t segment;
} PACKED;
} __attribute__ (( packed ));
typedef struct segoff segoff_t;