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

Better error checking and more complete struct initialization.

Browse Source 
Reviewed by:	Simon Shapiro <shimon@simon-shapiro.org>
This commit is contained in:
eivind 1998-12-22 00:52:27 +00:00
parent bfa99712d7
commit 67f47c87c4
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/dpt/dpt_scsi.c
View File

@ -43,7 +43,7 @@
* arrays that span controllers (Wow!). * arrays that span controllers (Wow!).
*/ */
#ident "$Id: dpt_scsi.c,v 1.19 1998/10/15 23:17:56 gibbs Exp $" #ident "$Id: dpt_scsi.c,v 1.20 1998/10/15 23:46:24 gibbs Exp $"
#define _DPT_C_ #define _DPT_C_
@ -300,10 +300,15 @@ dptallocsgmap(struct dpt_softc *dpt)
return (NULL); return (NULL);
} }
SLIST_INSERT_HEAD(&dpt->sg_maps, sg_map, links); if (bus_dmamap_load(dpt->sg_dmat, sg_map->sg_dmamap, sg_map->sg_vaddr,
PAGE_SIZE, dptmapmem, &sg_map->sg_physaddr, /*flags*/0)) {
bus_dmamem_free(dpt->sg_dmat, sg_map->sg_vaddr,
sg_map->sg_dmamap);
free(sg_map, M_DEVBUF);
return (NULL);
}
bus_dmamap_load(dpt->sg_dmat, sg_map->sg_dmamap, sg_map->sg_vaddr, SLIST_INSERT_HEAD(&dpt->sg_maps, sg_map, links);
PAGE_SIZE, dptmapmem, &sg_map->sg_physaddr, /*flags*/0);
return (sg_map); return (sg_map);
} }
@ -1128,7 +1133,7 @@ dpt_free(struct dpt_softc *dpt)
free(dpt, M_DEVBUF); free(dpt, M_DEVBUF);
} }
u_int8_t string_sizes[] = static u_int8_t string_sizes[] =
{ {
sizeof(((dpt_inq_t*)NULL)->vendor), sizeof(((dpt_inq_t*)NULL)->vendor),
sizeof(((dpt_inq_t*)NULL)->modelNum), sizeof(((dpt_inq_t*)NULL)->modelNum),
@ -1147,6 +1152,9 @@ dpt_init(struct dpt_softc *dpt)
int i; int i;
int retval; int retval;
dpt->init_level = 0;
SLIST_INIT(&dpt->sg_maps);
#ifdef DPT_RESET_BOARD #ifdef DPT_RESET_BOARD
printf("dpt%d: resetting HBA\n", dpt->unit); printf("dpt%d: resetting HBA\n", dpt->unit);
dpt_outb(dpt, HA_WCOMMAND, EATA_CMD_RESET); dpt_outb(dpt, HA_WCOMMAND, EATA_CMD_RESET);