diff options
| author | phk <phk@FreeBSD.org> | 2003-01-20 11:15:12 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-01-20 11:15:12 +0000 |
| commit | cca3e5de49a48c4060b49c776811732c491d1077 (patch) | |
| tree | 5c0dea3257d09da636d490d9ca68fd3cb92c227b /sys/boot | |
| parent | 2b485632c147c30ba1209ee10bf487ba749149f0 (diff) | |
| download | FreeBSD-src-cca3e5de49a48c4060b49c776811732c491d1077.zip FreeBSD-src-cca3e5de49a48c4060b49c776811732c491d1077.tar.gz | |
Use NEXTDOSPART instead of MAX_SLICES.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/libi386/biosdisk.c | 5 | ||||
| -rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c index 67c0f71..ff41c1a 100644 --- a/sys/boot/i386/libi386/biosdisk.c +++ b/sys/boot/i386/libi386/biosdisk.c @@ -39,7 +39,6 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskmbr.h> #include <sys/reboot.h> @@ -83,7 +82,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 dos_partition od_slicetab[NEXTDOSPART]; }; /* @@ -655,7 +654,7 @@ bd_checkextended(struct open_disk *od, int slicenum) for (i = 0; i < NDOSPART; i++, dp++) { if (dp->dp_size == 0) continue; - if (od->od_nslices == MAX_SLICES) + if (od->od_nslices == NEXTDOSPART) goto done; dp->dp_start += base; bcopy(dp, &od->od_slicetab[od->od_nslices], sizeof(*dp)); diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c index d5c0a65..2d9afbd 100644 --- a/sys/boot/pc98/libpc98/biosdisk.c +++ b/sys/boot/pc98/libpc98/biosdisk.c @@ -86,7 +86,7 @@ struct open_disk { #endif struct disklabel od_disklabel; int od_nslices; /* slice count */ - struct pc98_partition od_slicetab[MAX_SLICES]; + struct pc98_partition od_slicetab[NEXTDOSPART]; }; /* @@ -778,7 +778,7 @@ bd_checkextended(struct open_disk *od, int slicenum) for (i = 0; i < NDOSPART; i++, dp++) { if (dp->dp_size == 0) continue; - if (od->od_nslices == MAX_SLICES) + if (od->od_nslices == NEXTDOSPART) goto done; dp->dp_start += base; bcopy(dp, &od->od_slicetab[od->od_nslices], sizeof(*dp)); |
