svn commit: r245938 - in stable/9/sys: conf dev/hpt27xx modules/hpt27xx

[Xin LI]

Author: delphij
Date: Sat Jan 26 05:20:09 2013
New Revision: 245938
URL: http://svnweb.freebsd.org/changeset/base/245938

Log:
  MFC r245768:
  
   - Don't include date and time the driver is built, this is useful for
     generating binary diffs.
   - Constify a few strings used in the driver.
   - Style changes to make the driver compile with default clang settings.
  
  Approved by:	HighPoint Technologies

Modified:
  stable/9/sys/conf/files.amd64
  stable/9/sys/conf/files.i386
  stable/9/sys/dev/hpt27xx/hpt27xx_config.c
  stable/9/sys/dev/hpt27xx/os_bsd.h
  stable/9/sys/dev/hpt27xx/osm_bsd.c
  stable/9/sys/modules/hpt27xx/Makefile
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/conf/files.amd64
==============================================================================
--- stable/9/sys/conf/files.amd64	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/conf/files.amd64	Sat Jan 26 05:20:09 2013	(r245938)
@@ -192,8 +192,7 @@ dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
 dev/hpt27xx/os_bsd.c		optional	hpt27xx
-dev/hpt27xx/osm_bsd.c		optional	hpt27xx \
-	compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}"
+dev/hpt27xx/osm_bsd.c		optional	hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx
 dev/hptmv/entry.c		optional	hptmv
 dev/hptmv/mv.c			optional	hptmv

Modified: stable/9/sys/conf/files.i386
==============================================================================
--- stable/9/sys/conf/files.i386	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/conf/files.i386	Sat Jan 26 05:20:09 2013	(r245938)
@@ -180,8 +180,7 @@ dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
 dev/hpt27xx/os_bsd.c		optional hpt27xx
-dev/hpt27xx/osm_bsd.c		optional hpt27xx \
-	compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}"
+dev/hpt27xx/osm_bsd.c		optional hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional hpt27xx
 dev/hptmv/entry.c		optional hptmv
 dev/hptmv/mv.c			optional hptmv

Modified: stable/9/sys/dev/hpt27xx/hpt27xx_config.c
==============================================================================
--- stable/9/sys/dev/hpt27xx/hpt27xx_config.c	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/dev/hpt27xx/hpt27xx_config.c	Sat Jan 26 05:20:09 2013	(r245938)
@@ -58,9 +58,9 @@ int init_config(void)
 	return 0;
 }
 
-char driver_name[] = "hpt27xx";
-char driver_name_long[] = "RocketRAID 27xx controller driver";
-char driver_ver[] = "v1.0 (" __DATE__ " " __TIME__ ")";
+const char driver_name[] = "hpt27xx";
+const char driver_name_long[] = "RocketRAID 27xx controller driver";
+const char driver_ver[] = "v1.0";
 int  osm_max_targets = 0xff;
 
 

Modified: stable/9/sys/dev/hpt27xx/os_bsd.h
==============================================================================
--- stable/9/sys/dev/hpt27xx/os_bsd.h	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/dev/hpt27xx/os_bsd.h	Sat Jan 26 05:20:09 2013	(r245938)
@@ -135,9 +135,9 @@ INQUIRYDATA, *PINQUIRYDATA;
 #include <dev/hpt27xx/ldm.h>
 
 /* driver parameters */
-extern char driver_name[];
-extern char driver_name_long[];
-extern char driver_ver[];
+extern const char driver_name[];
+extern const char driver_name_long[];
+extern const char driver_ver[];
 extern int  osm_max_targets;
 
 /*

Modified: stable/9/sys/dev/hpt27xx/osm_bsd.c
==============================================================================
--- stable/9/sys/dev/hpt27xx/osm_bsd.c	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/dev/hpt27xx/osm_bsd.c	Sat Jan 26 05:20:09 2013	(r245938)
@@ -167,7 +167,8 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_
 
 		HPT_ASSERT((f->size & (f->alignment-1))==0);
 
-		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1) ;
+		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1)
+			;
 
 		KdPrint(("%s: %d*%d=%d bytes, order %d",
 			f->tag, f->count, f->size, f->count*f->size, order));
@@ -1036,6 +1037,7 @@ static void hpt_final_init(void *dummy)
 	}
 
 	if (!i) {
+		if (bootverbose)
 			os_printk("no controller detected.");
 		return;
 	}
@@ -1177,7 +1179,7 @@ static void hpt_final_init(void *dummy)
 	}	
 
 	make_dev(&hpt_cdevsw, DRIVER_MINOR, UID_ROOT, GID_OPERATOR,
-	    S_IRUSR | S_IWUSR, driver_name);
+	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
 #if defined(KLD_MODULE) && (__FreeBSD_version >= 503000)
@@ -1224,6 +1226,7 @@ static void override_kernel_driver(void)
 
 static void hpt_init(void *dummy)
 {
+	if (bootverbose)
 		os_printk("%s %s", driver_name_long, driver_ver);
 
 	override_kernel_driver();

Modified: stable/9/sys/modules/hpt27xx/Makefile
==============================================================================
--- stable/9/sys/modules/hpt27xx/Makefile	Sat Jan 26 03:23:28 2013	(r245937)
+++ stable/9/sys/modules/hpt27xx/Makefile	Sat Jan 26 05:20:09 2013	(r245938)
@@ -12,6 +12,3 @@ hpt27xx_lib.o:
 	uudecode -p < ${HPT27XX}/$(MACHINE_ARCH)-elf.hpt27xx_lib.o.uu > ${.TARGET}
 
 .include <bsd.kmod.mk>
-
-CWARNFLAGS.osm_bsd.c=	${NO_WFORMAT_SECURITY}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}