diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2003-01-04 08:50:48 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2003-01-04 08:50:48 +0000 |
| commit | 404a379e4a64c2b0b6fcf3b9df039d019975d666 (patch) | |
| tree | 564ff0c6cce1ed927a6fa1c29c37132bcc9a33b1 /sys/boot | |
| parent | 4bf2855c97e081eda0fa40ccbc1d26f125e3187c (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/pc98/boot2/disk.c | 4 | ||||
| -rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c index 297e806eaa3f..e8782581f2ee 100644 --- a/sys/boot/pc98/boot2/disk.c +++ b/sys/boot/pc98/boot2/disk.c @@ -77,7 +77,7 @@ static char *Bread(int dosdev, int sector); int devopen(void) { - struct dos_partition *dptr; + struct pc98_partition *dptr; struct disklabel *dl; char *p; int i, sector = 0, di, dosdev_copy; @@ -99,7 +99,7 @@ devopen(void) #else /* EMBEDDED_DISKLABEL */ #ifdef PC98 p = Bread(dosdev_copy, 1); - dptr = (struct dos_partition *)p; + dptr = (struct pc98_partition *)p; slice = WHOLE_DISK_SLICE; for (i = 0; i < NDOSPART; i++, dptr++) if (dptr->dp_mid == DOSPTYP_386BSD) { diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c index ea36959536f0..9606a11423b0 100644 --- a/sys/boot/pc98/libpc98/biosdisk.c +++ b/sys/boot/pc98/libpc98/biosdisk.c @@ -83,7 +83,7 @@ struct open_disk { #define BD_PARTTABOK 0x0010 struct disklabel od_disklabel; int od_nslices; /* slice count */ - struct dos_partition od_slicetab[MAX_SLICES]; + struct pc98_partition od_slicetab[MAX_SLICES]; }; /* @@ -109,7 +109,7 @@ static int bd_write(struct open_disk *od, daddr_t dblk, int blks, static int bd_int13probe(struct bdinfo *bd); -static void bd_printslice(struct open_disk *od, struct dos_partition *dp, +static void bd_printslice(struct open_disk *od, struct pc98_partition *dp, char *prefix, int verbose); static void bd_printbsdslice(struct open_disk *od, daddr_t offset, char *prefix, int verbose); @@ -298,7 +298,7 @@ bd_print(int verbose) char line[80]; struct i386_devdesc dev; struct open_disk *od; - struct dos_partition *dptr; + struct pc98_partition *dptr; for (i = 0; i < nbdinfo; i++) { #ifdef PC98 @@ -523,7 +523,7 @@ bd_open(struct open_file *f, ...) static int bd_opendisk(struct open_disk **odp, struct i386_devdesc *dev) { - struct dos_partition *dptr; + struct pc98_partition *dptr; struct disklabel *lp; struct open_disk *od; int sector, slice, i; @@ -605,7 +605,7 @@ bd_opendisk(struct open_disk **odp, struct i386_devdesc *dev) * copy the partition table, then pick up any extended partitions. */ bcopy(buf + DOSPARTOFF, &od->od_slicetab, - sizeof(struct dos_partition) * NDOSPART); + sizeof(struct pc98_partition) * NDOSPART); #ifdef PC98 od->od_nslices = NDOSPART; /* extended slices start here */ #else @@ -810,7 +810,7 @@ done: static int bd_bestslice(struct open_disk *od) { - struct dos_partition *dp; + struct pc98_partition *dp; int pref, preflevel; int i, prefslice; |