Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

sun-parts: fix id and flag sizes

Browse Source 
Also use __bexx_to_cpu() to access the fields.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@840 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2010-08-07 12:49:53 +00:00
parent 988f780aa5
commit f7717af419
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/sun-parts.c
View File

@@ -46,10 +46,8 @@ struct sun_disklabel {
uint8_t info[128]; /* Informative text string */ uint8_t info[128]; /* Informative text string */
uint8_t spare0[14]; uint8_t spare0[14];
struct sun_info { struct sun_info {
uint8_t spare1; uint16_t id;
uint8_t id; uint16_t flags;
uint8_t spare2;
uint8_t flags;
} infos[8]; } infos[8];
uint8_t spare[246]; /* Boot information etc. */ uint8_t spare[246]; /* Boot information etc. */
uint16_t rspeed; /* Disk rotational speed */ uint16_t rspeed; /* Disk rotational speed */
@@ -172,8 +170,11 @@ sunparts_open( sunparts_info_t *di )
p = (struct sun_disklabel *)buf; p = (struct sun_disklabel *)buf;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder, DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i,
p->partitions[i].num_sectors, p->infos[i].id, p->infos[i].flags); __be32_to_cpu(p->partitions[i].start_cylinder),
__be32_to_cpu(p->partitions[i].num_sectors),
__be16_to_cpu(p->infos[i].id),
__be16_to_cpu(p->infos[i].flags));
if (parnum < 0) { if (parnum < 0) {
if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0) if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0)
parnum = i; parnum = i;
@@ -193,7 +194,7 @@ sunparts_open( sunparts_info_t *di )
size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs;
di->size_hi = size >> BITS; di->size_hi = size >> BITS;
di->size_lo = size & (ucell) -1; di->size_lo = size & (ucell) -1;
di->type = __be32_to_cpu(p->infos[parnum].id); di->type = __be16_to_cpu(p->infos[parnum].id);
DPRINTF("Found Sun partition, offs %lld size %lld\n", DPRINTF("Found Sun partition, offs %lld size %lld\n",
(long long)offs, (long long)size); (long long)offs, (long long)size);