CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: andvar Date: Fri May 26 06:36:39 UTC 2023 Modified Files: src/sys/arch/bebox/stand/boot: siop.c Log Message: set error to EIO on SKEY_ABORTED_COMMAND. It is usually the case for other SCSI drivers, though they do implement retries too. potentially same should be committed to prep(?). discussed with riastradh. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/bebox/stand/boot/siop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/bebox/stand/boot/siop.c diff -u src/sys/arch/bebox/stand/boot/siop.c:1.12 src/sys/arch/bebox/stand/boot/siop.c:1.13 --- src/sys/arch/bebox/stand/boot/siop.c:1.12 Fri May 26 06:27:51 2023 +++ src/sys/arch/bebox/stand/boot/siop.c Fri May 26 06:36:39 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.12 2023/05/26 06:27:51 andvar Exp $ */ +/* $NetBSD: siop.c,v 1.13 2023/05/26 06:36:39 andvar Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -991,7 +991,7 @@ scsi_interpret_sense(struct siop_adapter case SKEY_BLANK_CHECK: break; case SKEY_ABORTED_COMMAND: - /* XXX XXX initialize 'error' */ + error = EIO; break; case SKEY_VOLUME_OVERFLOW: error = ENOSPC;
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: andvar Date: Fri May 26 06:36:39 UTC 2023 Modified Files: src/sys/arch/bebox/stand/boot: siop.c Log Message: set error to EIO on SKEY_ABORTED_COMMAND. It is usually the case for other SCSI drivers, though they do implement retries too. potentially same should be committed to prep(?). discussed with riastradh. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/bebox/stand/boot/siop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src
Committed By: andvar
Date: Fri May 26 06:27:51 UTC 2023
Modified Files:
src/sys/arch/bebox/stand/boot: siop.c
Log Message:
initialize error on definition to fix 'error' may not be initialized issue.
the commit unifies code between bebox and prep machines.
reported by Mootja _08.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/bebox/stand/boot/siop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/stand/boot/siop.c
diff -u src/sys/arch/bebox/stand/boot/siop.c:1.11 src/sys/arch/bebox/stand/boot/siop.c:1.12
--- src/sys/arch/bebox/stand/boot/siop.c:1.11 Fri Jun 3 12:10:50 2022
+++ src/sys/arch/bebox/stand/boot/siop.c Fri May 26 06:27:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.11 2022/06/03 12:10:50 andvar Exp $ */
+/* $NetBSD: siop.c,v 1.12 2023/05/26 06:27:51 andvar Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -885,7 +885,7 @@ scsi_interpret_sense(struct siop_adapter
{
struct scsi_sense_data *sense;
u_int8_t key;
- int error;
+ int error = 0;
uint32_t info;
static const char *error_mes[] = {
"soft error (corrected)",
@@ -961,7 +961,6 @@ scsi_interpret_sense(struct siop_adapter
xs->resid = 0; /* not short read */
}
case SKEY_EQUAL:
- error = 0;
break;
case SKEY_NOT_READY:
if (adp->sd->sc_flags & FLAGS_REMOVABLE)
@@ -990,7 +989,6 @@ scsi_interpret_sense(struct siop_adapter
error = EROFS;
break;
case SKEY_BLANK_CHECK:
- error = 0;
break;
case SKEY_ABORTED_COMMAND:
/* XXX XXX initialize 'error' */
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: andvar Date: Fri May 26 06:27:51 UTC 2023 Modified Files: src/sys/arch/bebox/stand/boot: siop.c Log Message: initialize error on definition to fix 'error' may not be initialized issue. the commit unifies code between bebox and prep machines. reported by Mootja _08. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/bebox/stand/boot/siop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: rin Date: Fri Apr 29 20:48:27 UTC 2022 Modified Files: src/sys/arch/bebox/stand/boot: tgets.c Log Message: Fix fallout from libsa change; stand.h includes now. SCANWAIT and PWAIT are renamed to SCANDELAY and SCANWAIT, respectively, in order not to redefine PWAIT. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/bebox/stand/boot/tgets.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src
Committed By: rin
Date: Fri Apr 29 20:48:27 UTC 2022
Modified Files:
src/sys/arch/bebox/stand/boot: tgets.c
Log Message:
Fix fallout from libsa change; stand.h includes now.
SCANWAIT and PWAIT are renamed to SCANDELAY and SCANWAIT, respectively,
in order not to redefine PWAIT.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/bebox/stand/boot/tgets.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/stand/boot/tgets.c
diff -u src/sys/arch/bebox/stand/boot/tgets.c:1.8 src/sys/arch/bebox/stand/boot/tgets.c:1.9
--- src/sys/arch/bebox/stand/boot/tgets.c:1.8 Fri Feb 25 10:12:44 2011
+++ src/sys/arch/bebox/stand/boot/tgets.c Fri Apr 29 20:48:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tgets.c,v 1.8 2011/02/25 10:12:44 kiyohara Exp $ */
+/* $NetBSD: tgets.c,v 1.9 2022/04/29 20:48:26 rin Exp $ */
/*-
* Copyright (c) 1993
@@ -43,12 +43,12 @@ tgets(char *buf)
#ifdef USE_SCAN
int i;
-#define SCANWAIT 1
-#define PWAIT 500
- for (i = 0; i < PWAIT; i++) {
+#define SCANDELAY 1
+#define SCANWAIT 500
+ for (i = 0; i < SCANWAIT; i++) {
if ((c = cnscan()) != -1)
goto next;
- delay(SCANWAIT);
+ delay(SCANDELAY);
}
return -1;
next:
