diff options
Diffstat (limited to 'sys/dev/dpt')
| -rw-r--r-- | sys/dev/dpt/dpt_control.c | 5 | ||||
| -rw-r--r-- | sys/dev/dpt/dpt_scsi.c | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c index b28fb672d1cf..ba4bec9c3cdb 100644 --- a/sys/dev/dpt/dpt_control.c +++ b/sys/dev/dpt/dpt_control.c @@ -36,7 +36,7 @@ * future. */ -#ident "$Id: dpt_control.c,v 1.9 1998/09/15 08:33:31 gibbs Exp $" +#ident "$Id: dpt_control.c,v 1.8 1998/08/05 00:54:36 eivind Exp $" #include "opt_dpt.h" @@ -782,8 +782,7 @@ dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p) compat_softc.ha_npend = dpt->submitted_ccbs_count; compat_softc.ha_active_jobs = dpt->waiting_ccbs_count; strncpy(compat_softc.ha_fw_version, - dpt->board_data.firmware, - sizeof(compat_softc.ha_fw_version)); + dpt->board_data.firmware, 4); compat_softc.ha_ccb = NULL; compat_softc.ha_cblist = NULL; compat_softc.ha_dev = NULL; diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c index 47c12a51bdad..42ff038f6645 100644 --- a/sys/dev/dpt/dpt_scsi.c +++ b/sys/dev/dpt/dpt_scsi.c @@ -43,7 +43,7 @@ * arrays that span controllers (Wow!). */ -#ident "$Id: dpt_scsi.c,v 1.21 1998/12/22 00:52:27 eivind Exp $" +#ident "$Id: dpt_scsi.c,v 1.19 1998/10/15 23:17:56 gibbs Exp $" #define _DPT_C_ @@ -300,12 +300,11 @@ dptallocsgmap(struct dpt_softc *dpt) return (NULL); } - (void)bus_dmamap_load(dpt->sg_dmat, sg_map->sg_dmamap, sg_map->sg_vaddr, - PAGE_SIZE, dptmapmem, &sg_map->sg_physaddr, - /*flags*/0); - SLIST_INSERT_HEAD(&dpt->sg_maps, sg_map, links); + bus_dmamap_load(dpt->sg_dmat, sg_map->sg_dmamap, sg_map->sg_vaddr, + PAGE_SIZE, dptmapmem, &sg_map->sg_physaddr, /*flags*/0); + return (sg_map); } @@ -1129,7 +1128,7 @@ dpt_free(struct dpt_softc *dpt) free(dpt, M_DEVBUF); } -static u_int8_t string_sizes[] = +u_int8_t string_sizes[] = { sizeof(((dpt_inq_t*)NULL)->vendor), sizeof(((dpt_inq_t*)NULL)->modelNum), @@ -1148,9 +1147,6 @@ dpt_init(struct dpt_softc *dpt) int i; int retval; - dpt->init_level = 0; - SLIST_INIT(&dpt->sg_maps); - #ifdef DPT_RESET_BOARD printf("dpt%d: resetting HBA\n", dpt->unit); dpt_outb(dpt, HA_WCOMMAND, EATA_CMD_RESET); |