Date: Fri, 29 Jun 2012 10:06:37 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r237758 - in stable/9/sys/boot: i386/libi386 i386/zfsboot pc98/libpc98 Message-ID: <201206291006.q5TA6bO9033020@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Jun 29 10:06:37 2012 New Revision: 237758 URL: http://svn.freebsd.org/changeset/base/237758 Log: MFC r235155: i386 boot: consolidate MAXBDDEV definition Modified: stable/9/sys/boot/i386/libi386/biosdisk.c stable/9/sys/boot/i386/libi386/libi386.h stable/9/sys/boot/i386/zfsboot/zfsboot.c stable/9/sys/boot/pc98/libpc98/biosdisk.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/boot/i386/libi386/biosdisk.c ============================================================================== --- stable/9/sys/boot/i386/libi386/biosdisk.c Fri Jun 29 10:04:23 2012 (r237757) +++ stable/9/sys/boot/i386/libi386/biosdisk.c Fri Jun 29 10:06:37 2012 (r237758) @@ -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 */ Modified: stable/9/sys/boot/i386/libi386/libi386.h ============================================================================== --- stable/9/sys/boot/i386/libi386/libi386.h Fri Jun 29 10:04:23 2012 (r237757) +++ stable/9/sys/boot/i386/libi386/libi386.h Fri Jun 29 10:06:37 2012 (r237758) @@ -58,7 +58,8 @@ int i386_setcurrdev(struct env_var *ev, 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; Modified: stable/9/sys/boot/i386/zfsboot/zfsboot.c ============================================================================== --- stable/9/sys/boot/i386/zfsboot/zfsboot.c Fri Jun 29 10:04:23 2012 (r237757) +++ stable/9/sys/boot/i386/zfsboot/zfsboot.c Fri Jun 29 10:06:37 2012 (r237758) @@ -61,8 +61,6 @@ __FBSDID("$FreeBSD$"); #define TYPE_MAXHARD TYPE_DA #define TYPE_FD 2 -#define MAXBDDEV 31 - extern uint32_t _end; #ifdef GPT Modified: stable/9/sys/boot/pc98/libpc98/biosdisk.c ============================================================================== --- stable/9/sys/boot/pc98/libpc98/biosdisk.c Fri Jun 29 10:04:23 2012 (r237757) +++ stable/9/sys/boot/pc98/libpc98/biosdisk.c Fri Jun 29 10:06:37 2012 (r237758) @@ -52,7 +52,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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206291006.q5TA6bO9033020>