diff options
| author | avg <avg@FreeBSD.org> | 2012-05-09 08:05:50 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-05-09 08:05:50 +0000 |
| commit | eff14f3f2c0ff6cd55b6dcc290f61ff21f516173 (patch) | |
| tree | 28b99430eb9687496602347c155edf4d1cc70598 /sys/boot/i386 | |
| parent | a5d68259c2d9ee2ae1d901e393c549f79274ba13 (diff) | |
| download | FreeBSD-src-eff14f3f2c0ff6cd55b6dcc290f61ff21f516173.zip FreeBSD-src-eff14f3f2c0ff6cd55b6dcc290f61ff21f516173.tar.gz | |
i386 boot: consolidate MAXBDDEV definition
MFC after: 1 month
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/libi386/biosdisk.c | 1 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/libi386.h | 3 | ||||
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c index 533ce44..23bbef7 100644 --- a/sys/boot/i386/libi386/biosdisk.c +++ b/sys/boot/i386/libi386/biosdisk.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #define BIOS_NUMDRIVES 0x475 #define BIOSDISK_SECSIZE 512 #define BUFSIZE (1 * BIOSDISK_SECSIZE) -#define MAXBDDEV MAXDEV #define DT_ATAPI 0x10 /* disk type for ATAPI floppies */ #define WDMAJOR 0 /* major numbers for devices we frontend for */ diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h index b8842ba..0a4621b 100644 --- a/sys/boot/i386/libi386/libi386.h +++ b/sys/boot/i386/libi386/libi386.h @@ -58,7 +58,8 @@ int i386_setcurrdev(struct env_var *ev, int flags, const void *value); extern struct devdesc currdev; /* our current device */ -#define MAXDEV 31 /* maximum number of distinct devices */ +#define MAXDEV 31 /* maximum number of distinct devices */ +#define MAXBDDEV MAXDEV /* exported devices XXX rename? */ extern struct devsw bioscd; diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index 17881dd..452d9ae 100644 --- a/sys/boot/i386/zfsboot/zfsboot.c +++ b/sys/boot/i386/zfsboot/zfsboot.c @@ -61,8 +61,6 @@ __FBSDID("$FreeBSD$"); #define TYPE_MAXHARD TYPE_DA #define TYPE_FD 2 -#define MAXBDDEV 31 - extern uint32_t _end; #ifdef GPT |
