diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2002-05-24 05:21:36 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2002-05-24 05:21:36 +0000 |
| commit | 9c580bea80f2761031f2364b02c2e5d58f127dc7 (patch) | |
| tree | 299e269edaa9961ae54ea8632669231c4aab4c05 | |
| parent | cae52cb6933b1e72e221b980839c7a994bb0c35a (diff) | |
Notes
| -rw-r--r-- | sys/dev/aha/aha.c | 1 | ||||
| -rw-r--r-- | sys/dev/ahb/ahb.c | 1 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 24 | ||||
| -rw-r--r-- | sys/dev/em/if_em_phy.c | 2 | ||||
| -rw-r--r-- | sys/dev/twe/twe_freebsd.c | 1 |
5 files changed, 16 insertions, 13 deletions
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index ec2f0128375a..78a959be0a45 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -257,6 +257,7 @@ aha_free(struct aha_softc *aha) case 1: bus_dma_tag_destroy(aha->mailbox_dmat); case 0: + break; } free(aha, M_DEVBUF); } diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c index dcb7f90ee6ab..740d626036c1 100644 --- a/sys/dev/ahb/ahb.c +++ b/sys/dev/ahb/ahb.c @@ -425,6 +425,7 @@ ahbfree(struct ahb_softc *ahb) case 1: bus_dma_tag_destroy(ahb->buffer_dmat); case 0: + break; } free(ahb, M_DEVBUF); } diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 1a062dd2444e..3afedf9a893d 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -2796,20 +2796,20 @@ rgb_vbi_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) if ( notclipped(bktr, i, width)) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { split(bktr,(volatile u_long **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } } @@ -2853,19 +2853,19 @@ rgb_vbi_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) if ( notclipped(bktr, i, width)) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t) &target, cols); } } @@ -2950,20 +2950,20 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) if ( notclipped(bktr, i, width)) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { split(bktr,(volatile u_long **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } } @@ -3016,19 +3016,19 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) if ( notclipped(bktr, i, width)) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, - Bpp, (volatile u_char **) &target, + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { split(bktr, (volatile u_long **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, - Bpp, (volatile u_char **) &target, cols); + Bpp, (volatile u_char **)(uintptr_t)&target, cols); } } diff --git a/sys/dev/em/if_em_phy.c b/sys/dev/em/if_em_phy.c index 76ffaaeb33b6..38606f2a4648 100644 --- a/sys/dev/em/if_em_phy.c +++ b/sys/dev/em/if_em_phy.c @@ -1354,7 +1354,7 @@ em_display_mii(struct em_shared_adapter *shared) return; } -#endif // DBG +#endif /* DBG */ /****************************************************************************** * Probes the expected PHY address for known PHY IDs diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index 403d9d861d52..df194a49081f 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -953,6 +953,7 @@ twe_setup_data_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int err break; default: /* no s/g list, nothing to do */ + break; } } |