comment and unify lb_uint64 handling as discussed on the mailinglist

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2086 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2005-11-14 23:04:55 +00:00
parent 8af7998bac
commit 0d304c18e2
4 changed files with 34 additions and 44 deletions

View File

@ -7,22 +7,6 @@
#include <device/device.h> #include <device/device.h>
#include <stdlib.h> #include <stdlib.h>
static inline uint64_t unpack_lb64(struct lb_uint64 value)
{
uint64_t result;
result = value.hi;
result = (result << 32) + value.lo;
return result;
}
static inline struct lb_uint64 pack_lb64(uint64_t value)
{
struct lb_uint64 result;
result.lo = (value >> 0) & 0xffffffff;
result.hi = (value >> 32) & 0xffffffff;
return result;
}
struct lb_header *lb_table_init(unsigned long addr) struct lb_header *lb_table_init(unsigned long addr)
{ {
struct lb_header *header; struct lb_header *header;

View File

@ -7,22 +7,6 @@
#include <device/device.h> #include <device/device.h>
#include <stdlib.h> #include <stdlib.h>
static inline uint64_t unpack_lb64(struct lb_uint64 value)
{
uint64_t result;
result = value.hi;
result = (result << 32) + value.lo;
return result;
}
static inline struct lb_uint64 pack_lb64(uint64_t value)
{
struct lb_uint64 result;
result.lo = (value >> 0) & 0xffffffff;
result.hi = (value >> 32) & 0xffffffff;
return result;
}
struct lb_header *lb_table_init(unsigned long addr) struct lb_header *lb_table_init(unsigned long addr)
{ {
struct lb_header *header; struct lb_header *header;

View File

@ -31,6 +31,40 @@
* table entries and be backwards compatible, but it is not required. * table entries and be backwards compatible, but it is not required.
*/ */
/* Since LinuxBIOS is usually compiled 32bit, gcc will align 64bit
* types to 32bit boundaries. If the LinuxBIOS table is dumped on a
* 64bit system, a uint64_t would be aligned to 64bit boundaries,
* breaking the table format.
*
* lb_uint64 will keep 64bit LinuxBIOS table values aligned to 32bit
* to ensure compatibility. They can be accessed with the two functions
* below: unpack_lb64() and pack_lb64()
*
* See also: util/lbtdump/lbtdump.c
*/
struct lb_uint64 {
uint32_t lo;
uint32_t hi;
};
static inline uint64_t unpack_lb64(struct lb_uint64 value)
{
uint64_t result;
result = value.hi;
result = (result << 32) + value.lo;
return result;
}
static inline struct lb_uint64 pack_lb64(uint64_t value)
{
struct lb_uint64 result;
result.lo = (value >> 0) & 0xffffffff;
result.hi = (value >> 32) & 0xffffffff;
return result;
}
struct lb_header struct lb_header
{ {
@ -57,10 +91,6 @@ struct lb_record {
#define LB_TAG_MEMORY 0x0001 #define LB_TAG_MEMORY 0x0001
struct lb_uint64 {
uint32_t lo;
uint32_t hi;
};
struct lb_memory_range { struct lb_memory_range {
struct lb_uint64 start; struct lb_uint64 start;
struct lb_uint64 size; struct lb_uint64 size;

View File

@ -9,14 +9,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include "../../src/include/boot/linuxbios_tables.h" #include "../../src/include/boot/linuxbios_tables.h"
static inline uint64_t unpack_lb64(struct lb_uint64 value)
{
uint64_t result;
result = value.hi;
result = (result << 32) + value.lo;
return result;
}
void print_lb_records(struct lb_record *rec, struct lb_record *last, unsigned long addr); void print_lb_records(struct lb_record *rec, struct lb_record *last, unsigned long addr);
unsigned long compute_checksum(void *addr, unsigned long length) unsigned long compute_checksum(void *addr, unsigned long length)