Module Name: src
Committed By: mrg
Date: Mon Feb 4 10:09:32 UTC 2019
Modified Files:
src/sys/dev/ic: aic79xx.c aic7xxx.c
Log Message:
add or adjust fallthru comments.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/aic79xx.c
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/ic/aic7xxx.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/dev/ic/aic79xx.c
diff -u src/sys/dev/ic/aic79xx.c:1.50 src/sys/dev/ic/aic79xx.c:1.51
--- src/sys/dev/ic/aic79xx.c:1.50 Sat Oct 18 08:33:27 2014
+++ src/sys/dev/ic/aic79xx.c Mon Feb 4 10:09:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.50 2014/10/18 08:33:27 snj Exp $ */
+/* $NetBSD: aic79xx.c,v 1.51 2019/02/04 10:09:31 mrg Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.50 2014/10/18 08:33:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.51 2019/02/04 10:09:31 mrg Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -1401,6 +1401,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
switch (scb->hscb->task_management) {
case SIU_TASKMGMT_ABORT_TASK:
tag = SCB_GET_TAG(scb);
+ /* FALLTHROUGH */
case SIU_TASKMGMT_ABORT_TASK_SET:
case SIU_TASKMGMT_CLEAR_TASK_SET:
lun = scb->hscb->lun;
@@ -1411,6 +1412,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
break;
case SIU_TASKMGMT_LUN_RESET:
lun = scb->hscb->lun;
+ /* FALLTHROUGH */
case SIU_TASKMGMT_TARGET_RESET:
{
struct ahd_devinfo devinfo;
@@ -5515,8 +5517,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
&sns_map->dmasegs, sns_map->nseg);
free(sns_map, M_DEVBUF);
}
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case 2:
{
struct map_node *sg_map;
@@ -5529,8 +5531,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
&sg_map->dmasegs, sg_map->nseg);
free(sg_map, M_DEVBUF);
}
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case 1:
{
struct map_node *hscb_map;
@@ -5543,8 +5545,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
&hscb_map->dmasegs, hscb_map->nseg);
free(hscb_map, M_DEVBUF);
}
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case 0:
break;
}
@@ -6175,6 +6177,7 @@ ahd_init(struct ahd_softc *ahd)
case FLX_CSTAT_OVER:
case FLX_CSTAT_UNDER:
warn_user++;
+ /* FALLTHROUGH */
case FLX_CSTAT_INVALID:
case FLX_CSTAT_OKAY:
if (warn_user == 0 && bootverbose == 0)
@@ -7341,8 +7344,8 @@ ahd_search_scb_list(struct ahd_softc *ah
if ((scb->flags & SCB_ACTIVE) == 0)
printf("Inactive SCB in Waiting List\n");
ahd_done(ahd, scb);
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case SEARCH_REMOVE:
ahd_rem_wscb(ahd, scbid, prev, next, tid);
if (prev == SCB_LIST_NULL)
@@ -7350,6 +7353,7 @@ ahd_search_scb_list(struct ahd_softc *ah
break;
case SEARCH_PRINT:
printf("0x%x ", scbid);
+ /* FALLTHROUGH */
case SEARCH_COUNT:
prev = scbid;
break;
@@ -8505,8 +8509,8 @@ ahd_download_instr(struct ahd_softc *ahd
{
fmt3_ins = &instr.format3;
fmt3_ins->address = ahd_resolve_seqaddr(ahd, fmt3_ins->address);
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case AIC_OP_OR:
case AIC_OP_AND:
case AIC_OP_XOR:
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.134 src/sys/dev/ic/aic7xxx.c:1.135
--- src/sys/dev/ic/aic7xxx.c:1.134 Mon Apr 2 10:44:06 2018
+++ src/sys/dev/ic/aic7xxx.c Mon Feb 4 10:09:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $
+ * $Id: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -5475,8 +5475,8 @@ ahc_search_qinfifo(struct ahc_softc *ahc
printf("Inactive SCB in "
"Waiting List\n");
ahc_done(ahc, scb);
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case SEARCH_REMOVE:
next = ahc_rem_wscb(ahc, next, prev);
break;
@@ -6470,8 +6470,8 @@ ahc_download_instr(struct ahc_softc *ahc
}
address -= address_offset;
fmt3_ins->address = address;
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case AIC_OP_OR:
case AIC_OP_AND:
case AIC_OP_XOR:
