Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 May 2012 08:05:50 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r235155 - in head/sys/boot: i386/libi386 i386/zfsboot pc98/libpc98
Message-ID:  <201205090805.q4985ppx072399@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205090805.q4985ppx072399>