diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-01-22 05:41:34 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-01-22 05:41:34 +0000 |
| commit | 8ec81e392654c03ebba7792e47bf3744d623cf54 (patch) | |
| tree | c4c6e1188fec1745a4f7d53a453a6a7cb1b6310a /sys/dev/hpt27xx | |
| parent | f792cb87f2e42279a845920c2e0df51454efc2f3 (diff) | |
Notes
Diffstat (limited to 'sys/dev/hpt27xx')
| -rw-r--r-- | sys/dev/hpt27xx/hpt27xx_config.c | 6 | ||||
| -rw-r--r-- | sys/dev/hpt27xx/os_bsd.h | 6 | ||||
| -rw-r--r-- | sys/dev/hpt27xx/osm_bsd.c | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys/dev/hpt27xx/hpt27xx_config.c b/sys/dev/hpt27xx/hpt27xx_config.c index f87c7ee768a1..5203f4a1ed92 100644 --- a/sys/dev/hpt27xx/hpt27xx_config.c +++ b/sys/dev/hpt27xx/hpt27xx_config.c @@ -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; diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h index 3895f4093a17..e3f8e7dd6386 100644 --- a/sys/dev/hpt27xx/os_bsd.h +++ b/sys/dev/hpt27xx/os_bsd.h @@ -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; /* diff --git a/sys/dev/hpt27xx/osm_bsd.c b/sys/dev/hpt27xx/osm_bsd.c index ac7e9d87c6e4..fab1c71df33c 100644 --- a/sys/dev/hpt27xx/osm_bsd.c +++ b/sys/dev/hpt27xx/osm_bsd.c @@ -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(); |