Date: Sun, 29 Jan 2012 12:54:36 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r230737 - in stable/8/sys: cam pc98/include pc98/pc98 Message-ID: <201201291254.q0TCsa3P035944@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sun Jan 29 12:54:36 2012 New Revision: 230737 URL: http://svn.freebsd.org/changeset/base/230737 Log: 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). Modified: stable/8/sys/cam/cam_xpt.c stable/8/sys/pc98/include/md_var.h stable/8/sys/pc98/pc98/pc98_machdep.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/cam/cam_xpt.c ============================================================================== --- stable/8/sys/cam/cam_xpt.c Sun Jan 29 12:54:31 2012 (r230736) +++ stable/8/sys/cam/cam_xpt.c Sun Jan 29 12:54:36 2012 (r230737) @@ -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> Modified: stable/8/sys/pc98/include/md_var.h ============================================================================== --- stable/8/sys/pc98/include/md_var.h Sun Jan 29 12:54:31 2012 (r230736) +++ stable/8/sys/pc98/include/md_var.h Sun Jan 29 12:54:36 2012 (r230737) @@ -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) \ Modified: stable/8/sys/pc98/pc98/pc98_machdep.h ============================================================================== --- stable/8/sys/pc98/pc98/pc98_machdep.h Sun Jan 29 12:54:31 2012 (r230736) +++ stable/8/sys/pc98/pc98/pc98_machdep.h Sun Jan 29 12:54:36 2012 (r230737) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201291254.q0TCsa3P035944>