From 7bef71bb8854722cb4591658ccd1ae270d66532c Mon Sep 17 00:00:00 2001
From: marius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 29 Jan 2012 12:54:36 +0000
Subject: [PATCH] MFC: r228027

Move the scsi_da_bios_params() prototype from pc98_machdep.h to md_var.h
where the prototype for pc98_ata_disk_firmware_geom_adjust() also lives
in order to avoid an #ifdef'ed include in cam(4).


git-svn-id: svn://svn.freebsd.org/base/stable/8@230737 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/cam/cam_xpt.c            | 4 ----
 sys/pc98/include/md_var.h    | 6 +++---
 sys/pc98/pc98/pc98_machdep.h | 3 ---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 00c5e60c3..7347135f5 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kthread.h>
 
-#ifdef PC98
-#include <pc98/pc98/pc98_machdep.h>	/* geometry translation */
-#endif
-
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_periph.h>
diff --git a/sys/pc98/include/md_var.h b/sys/pc98/include/md_var.h
index 5b1ebb357..34a544425 100644
--- a/sys/pc98/include/md_var.h
+++ b/sys/pc98/include/md_var.h
@@ -39,10 +39,10 @@ extern	int	need_pre_dma_flush;
 extern	int	need_post_dma_flush;
 
 /*
- * The ad driver maps the IDE disk's actual geometry to the firmware's
- * notion of geometry.  However, PC98 machines need to do something
- * different sometimes, so override the hook so we can do so.
+ * The geometry of disks might need adjustment on PC98 machines.
  */
+struct	ccb_calc_geometry;
+int	scsi_da_bios_params(struct ccb_calc_geometry *);
 struct disk;
 void	pc98_ata_disk_firmware_geom_adjust(struct disk *);
 #define	ata_disk_firmware_geom_adjust(disk)				\
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index 6113f14b6..6cbdaad1e 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.h
@@ -33,9 +33,6 @@
 void	pc98_init_dmac(void);
 unsigned int	pc98_getmemsize(unsigned *, unsigned *);
 
-struct	ccb_calc_geometry;
-int	scsi_da_bios_params(struct ccb_calc_geometry *);
-
 #define	PC98_VECTOR_SIZE			(0x400)
 #define	PC98_SYSTEM_PARAMETER_SIZE		(0x240)
 #define	PC98_SAVE_AREA				(0xa1000)
-- 
2.45.0