From owner-svn-src-head@FreeBSD.ORG Wed May 9 08:05:51 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C0CD106567B; Wed, 9 May 2012 08:05:51 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D7298FC1F; Wed, 9 May 2012 08:05:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4985p9P072404; Wed, 9 May 2012 08:05:51 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4985ppx072399; Wed, 9 May 2012 08:05:51 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201205090805.q4985ppx072399@svn.freebsd.org> From: Andriy Gapon Date: Wed, 9 May 2012 08:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235155 - in head/sys/boot: i386/libi386 i386/zfsboot pc98/libpc98 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2012 08:05:51 -0000 Author: avg Date: Wed May 9 08:05:50 2012 New Revision: 235155 URL: http://svn.freebsd.org/changeset/base/235155 Log: i386 boot: consolidate MAXBDDEV definition MFC after: 1 month Modified: head/sys/boot/i386/libi386/biosdisk.c head/sys/boot/i386/libi386/libi386.h head/sys/boot/i386/zfsboot/zfsboot.c head/sys/boot/pc98/libpc98/biosdisk.c Modified: head/sys/boot/i386/libi386/biosdisk.c ============================================================================== --- head/sys/boot/i386/libi386/biosdisk.c Wed May 9 08:04:29 2012 (r235154) +++ head/sys/boot/i386/libi386/biosdisk.c Wed May 9 08:05:50 2012 (r235155) @@ -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: head/sys/boot/i386/libi386/libi386.h ============================================================================== --- head/sys/boot/i386/libi386/libi386.h Wed May 9 08:04:29 2012 (r235154) +++ head/sys/boot/i386/libi386/libi386.h Wed May 9 08:05:50 2012 (r235155) @@ -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: head/sys/boot/i386/zfsboot/zfsboot.c ============================================================================== --- head/sys/boot/i386/zfsboot/zfsboot.c Wed May 9 08:04:29 2012 (r235154) +++ head/sys/boot/i386/zfsboot/zfsboot.c Wed May 9 08:05:50 2012 (r235155) @@ -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: head/sys/boot/pc98/libpc98/biosdisk.c ============================================================================== --- head/sys/boot/pc98/libpc98/biosdisk.c Wed May 9 08:04:29 2012 (r235154) +++ head/sys/boot/pc98/libpc98/biosdisk.c Wed May 9 08:05:50 2012 (r235155) @@ -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 */