Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't make assumptions about the contents of the system drive table.

Browse Source
This commit is contained in:
ad 2001-06-10 10:34:44 +00:00
parent 27c2892f13
commit 5f1286dfb9
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/dev/ic/mlx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlx.c,v 1.9 2001/05/15 12:49:37 ad Exp $ */
/* $NetBSD: mlx.c,v 1.10 2001/06/10 10:34:44 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -534,17 +534,32 @@ static void
mlx_configure(struct mlx_softc *mlx, int waitok)
{
struct mlx_enquiry *me;
struct mlx_enquiry_old *meo;
struct mlx_enq_sys_drive *mes;
struct mlx_sysdrive *ms;
struct mlx_attach_args mlxa;
int i, nunits;
u_int size;
me = mlx_enquire(mlx, MLX_CMD_ENQUIRY, sizeof(struct mlx_enquiry),
NULL, waitok);
if (me == NULL) {
printf("%s: ENQUIRY failed\n", mlx->mlx_dv.dv_xname);
return;
if (mlx->mlx_iftype == 2) {
meo = mlx_enquire(mlx, MLX_CMD_ENQUIRY_OLD,
sizeof(struct mlx_enquiry_old), NULL, waitok);
if (meo == NULL) {
printf("%s: ENQUIRY_OLD failed\n",
mlx->mlx_dv.dv_xname);
return;
}
mlx->mlx_numsysdrives = meo->me_num_sys_drvs;
free(meo, M_DEVBUF);
} else {
me = mlx_enquire(mlx, MLX_CMD_ENQUIRY,
sizeof(struct mlx_enquiry), NULL, waitok);
if (me == NULL) {
printf("%s: ENQUIRY failed\n", mlx->mlx_dv.dv_xname);
return;
}
mlx->mlx_numsysdrives = me->me_num_sys_drvs;
free(me, M_DEVBUF);
}
mes = mlx_enquire(mlx, MLX_CMD_ENQSYSDRIVE,
@ -565,9 +580,6 @@ mlx_configure(struct mlx_softc *mlx, int waitok)
size = le32toh(mes[i].sd_size);
ms->ms_state = mes[i].sd_state;
if (i >= me->me_num_sys_drvs)
continue;
/*
* If an existing device has changed in some way (e.g. no
* longer present) then detach it.
@ -581,6 +593,8 @@ mlx_configure(struct mlx_softc *mlx, int waitok)
ms->ms_state = mes[i].sd_state;
ms->ms_dv = NULL;
if (i >= mlx->mlx_numsysdrives)
continue;
if (size == 0xffffffffU || size == 0)
continue;
@ -594,7 +608,6 @@ mlx_configure(struct mlx_softc *mlx, int waitok)
}
free(mes, M_DEVBUF);
free(me, M_DEVBUF);
if (nunits != 0)
mlx_adjqparam(mlx, mlx->mlx_max_queuecnt / nunits,
@ -1146,7 +1159,7 @@ mlx_periodic_enquiry(struct mlx_ccb *mc)
dr = &mlx->mlx_sysdrive[0];
for (i = 0; i < MLX_MAX_DRIVES; i++) {
for (i = 0; i < mlx->mlx_numsysdrives; i++) {
/* Has state been changed by controller? */
if (dr->ms_state != mes[i].sd_state) {
switch (mes[i].sd_state) {
@ -1161,6 +1174,10 @@ mlx_periodic_enquiry(struct mlx_ccb *mc)
case MLX_SYSD_CRITICAL:
statestr = "critical";
break;
default:
statestr = "unknown";
break;
}
printf("%s: unit %d %s\n", mlx->mlx_dv.dv_xname,

3
sys/dev/ic/mlxvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlxvar.h,v 1.2 2001/05/06 19:53:04 ad Exp $ */
/* $NetBSD: mlxvar.h,v 1.3 2001/06/10 10:34:44 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -161,6 +161,7 @@ struct mlx_softc {
int mlx_flags;
struct mlx_sysdrive mlx_sysdrive[MLX_MAX_DRIVES];
int mlx_numsysdrives;
};
#define MLX_BG_CHECK 1 /* we started a check */