diff options
author | nyan <nyan@FreeBSD.org> | 2003-01-04 08:50:48 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2003-01-04 08:50:48 +0000 |
commit | 864080610ecb4bdf1e559a7f65f6e149c26ede85 (patch) | |
tree | 564ff0c6cce1ed927a6fa1c29c37132bcc9a33b1 /sys | |
parent | d409ed88f5d1f0e447be9bda781b1812ae8b69b9 (diff) | |
download | FreeBSD-src-864080610ecb4bdf1e559a7f65f6e149c26ede85.zip FreeBSD-src-864080610ecb4bdf1e559a7f65f6e149c26ede85.tar.gz |
Rename the dos_partition structure for pc98 to pc98_partition.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/pc98/boot2/disk.c | 4 | ||||
-rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 12 | ||||
-rw-r--r-- | sys/geom/geom_pc98.c | 16 | ||||
-rw-r--r-- | sys/pc98/pc98/diskslice_machdep.c | 14 | ||||
-rw-r--r-- | sys/sys/diskpc98.h | 4 |
5 files changed, 25 insertions, 25 deletions
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c index 297e806..e878258 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 ea36959..9606a11 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; diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c index 90f51ed..d61e50b 100644 --- a/sys/geom/geom_pc98.c +++ b/sys/geom/geom_pc98.c @@ -55,7 +55,7 @@ #define PC98_CLASS_NAME "PC98" static void -g_dec_dos_partition(u_char *ptr, struct dos_partition *d) +g_dec_pc98_partition(u_char *ptr, struct pc98_partition *d) { u_int u; @@ -83,7 +83,7 @@ struct g_pc98_softc { }; static void -g_pc98_print(int i, struct dos_partition *dp) +g_pc98_print(int i, struct pc98_partition *dp) { char sname[17]; @@ -103,7 +103,7 @@ g_pc98_modify(struct g_geom *gp, struct g_pc98_softc *ms, u_char *sec) { int i, error; off_t s[NDOSPART], l[NDOSPART]; - struct dos_partition dp[NDOSPART]; + struct pc98_partition dp[NDOSPART]; g_topology_assert(); @@ -120,8 +120,8 @@ g_pc98_modify(struct g_geom *gp, struct g_pc98_softc *ms, u_char *sec) #endif for (i = 0; i < NDOSPART; i++) - g_dec_dos_partition( - sec + 512 + i * sizeof(struct dos_partition), &dp[i]); + g_dec_pc98_partition( + sec + 512 + i * sizeof(struct pc98_partition), &dp[i]); for (i = 0; i < NDOSPART; i++) { /* If start and end are identical it's bogus */ @@ -255,16 +255,16 @@ g_pc98_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, { struct g_pc98_softc *mp; struct g_slicer *gsp; - struct dos_partition dp; + struct pc98_partition dp; char sname[17]; gsp = gp->softc; mp = gsp->softc; g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { - g_dec_dos_partition( + g_dec_pc98_partition( mp->sec + 512 + - pp->index * sizeof(struct dos_partition), &dp); + pp->index * sizeof(struct pc98_partition), &dp); strncpy(sname, dp.dp_name, 16); sname[16] = '\0'; if (indent == NULL) { diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index 3bec4c6..7e8a299 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -65,11 +65,11 @@ static volatile u_char dsi_debug; -static int check_part(char *sname, struct dos_partition *dp, +static int check_part(char *sname, struct pc98_partition *dp, u_long offset, int nsectors, int ntracks, u_long mbr_offset); static int mbr_setslice(char *sname, struct disklabel *lp, - struct diskslice *sp, struct dos_partition *dp, + struct diskslice *sp, struct pc98_partition *dp, u_long br_offset); #define DPBLKNO(cyl,hd,sect) ((cyl)*(lp->d_secpercyl)) @@ -81,7 +81,7 @@ int atcompat_dsinit(dev_t dev, static int check_part(sname, dp, offset, nsectors, ntracks, mbr_offset ) char *sname; - struct dos_partition *dp; + struct pc98_partition *dp; u_long offset; int nsectors; int ntracks; @@ -172,8 +172,8 @@ dsinit(dev, lp, sspp) struct buf *bp; u_char *cp; int dospart; - struct dos_partition *dp; - struct dos_partition *dp0; + struct pc98_partition *dp; + struct pc98_partition *dp0; int error; int max_ncyls; int max_nsectors; @@ -276,7 +276,7 @@ dsinit(dev, lp, sspp) return atcompat_dsinit(dev, lp, sspp); } #endif - dp0 = (struct dos_partition *)(cp + 512); + dp0 = (struct pc98_partition *)(cp + 512); /* Guess the geometry. */ /* @@ -381,7 +381,7 @@ mbr_setslice(sname, lp, sp, dp, br_offset) char *sname; struct disklabel *lp; struct diskslice *sp; - struct dos_partition *dp; + struct pc98_partition *dp; u_long br_offset; { u_long offset; diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index aaca7d1..3bfb2c8 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -44,7 +44,7 @@ #define NDOSPART 16 #define DOSPTYP_386BSD 0x94 /* 386BSD partition type */ -struct dos_partition { +struct pc98_partition { unsigned char dp_mid; #define DOSMID_386BSD (0x14|0x80) /* 386bsd|bootable */ unsigned char dp_sid; @@ -63,7 +63,7 @@ struct dos_partition { unsigned char dp_name[16]; }; #ifdef CTASSERT -CTASSERT(sizeof (struct dos_partition) == 32); +CTASSERT(sizeof (struct pc98_partition) == 32); #endif #define DIOCGPC98 _IOR('M', 128, u_char[8192]) |