From 88e850bb7e2d2e5a5e728ce109031794adede59a Mon Sep 17 00:00:00 2001 From: marius Date: Sun, 27 Nov 2011 16:22:19 +0000 Subject: [PATCH 49/65] 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: http://svn.freebsd.org/base/head@228027 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit fe5d763455b1e7d5be0956ab968465d2858ff96d) Signed-off-by: Xin Li --- 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 8611848..000e48a 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -48,10 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef PC98 -#include /* geometry translation */ -#endif - #include #include #include diff --git a/sys/pc98/include/md_var.h b/sys/pc98/include/md_var.h index 8a3e53a..fe881ba 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 6113f14..6cbdaad 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) -- 1.7.8.3