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

aic79xx.c:

Browse Source 
aic7xxx.c:
	Allow print_reg() to be called with a NULL column.

aic79xx.c:
	Correct new usage of SCB_GET_TAG().

aic7xxx.c:
	Fix stray ahd that snuck in here.
This commit is contained in:
gibbs 2005-02-16 23:13:38 +00:00
parent 1e033a07a4
commit 9c3918cbd1
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/aic7xxx/aic79xx.c
View File

@ -8933,6 +8933,12 @@ ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
{
int printed;
u_int printed_mask;
u_int dummy_column;
if (cur_column == NULL) {
dummy_column = 0;
cur_column = &dummy_column;
}
if (cur_column != NULL && *cur_column >= wrap_point) {
printf("\n");
@ -8969,8 +8975,7 @@ ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
printed += printf(") ");
else
printed += printf(" ");
if (cur_column != NULL)
*cur_column += printed;
*cur_column += printed;
return (printed);
}
@ -9355,7 +9360,7 @@ ahd_recover_commands(struct ahd_softc *ahd)
lun = SCB_GET_LUN(scb);
ahd_print_path(ahd, scb);
printf("SCB %d - timed out\n", SCB_GET_TAG(scb->hscb->tag));
printf("SCB %d - timed out\n", SCB_GET_TAG(scb));
if (scb->flags & (SCB_DEVICE_RESET|SCB_ABORT)) {
/*
@ -9422,7 +9427,7 @@ bus_reset:
"Identify Msg.\n", ahd_name(ahd));
goto bus_reset;
} else if (ahd_search_qinfifo(ahd, target, channel, lun,
SCB_GET_TAG(scb->hscb->tag),
SCB_GET_TAG(scb),
ROLE_INITIATOR, /*status*/0,
SEARCH_COUNT) > 0) {

8
sys/dev/aic7xxx/aic7xxx.c
View File

@ -3924,7 +3924,7 @@ ahc_alloc(void *platform_arg, char *name)
return (NULL);
}
LIST_INIT(&ahc->pending_scbs);
LIST_INIT(&ahd->timedout_scbs);
LIST_INIT(&ahc->timedout_scbs);
/* We don't know our unit number until the OSM sets it */
ahc->name = name;
ahc->unit = -1;
@ -6707,6 +6707,12 @@ ahc_print_register(ahc_reg_parse_entry_t *table, u_int num_entries,
{
int printed;
u_int printed_mask;
u_int dummy_column;
if (cur_column == NULL) {
dummy_column = 0;
cur_column = &dummy_column;
}
if (cur_column != NULL && *cur_column >= wrap_point) {
printf("\n");