d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't include date and time the driver is built, this is useful for

Browse Source 
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
MFC after:	3 days
This commit is contained in:
Xin LI 2013-01-22 05:41:34 +00:00
parent f792cb87f2
commit 8ec81e3926
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245768
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/files.amd64
View File

@ -190,8 +190,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

3
sys/conf/files.i386
View File

@ -181,8 +181,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

6
sys/dev/hpt27xx/hpt27xx_config.c
View File

@ -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;

6
sys/dev/hpt27xx/os_bsd.h
View File

@ -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;
/*

7
sys/dev/hpt27xx/osm_bsd.c
View File

@ -167,7 +167,8 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
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();

3
sys/modules/hpt27xx/Makefile
View File

@ -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}}