Module Name: src
Committed By: tsutsui
Date: Fri Sep 18 14:09:42 UTC 2009
Modified Files:
src/sys/dev/sbus: be.c qe.c qec.c qecvar.h
Log Message:
Use uint8_t pointers for TX/RX buffers to avoid extra pointer casts.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sbus/qecvar.h
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/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.70 src/sys/dev/sbus/be.c:1.71
--- src/sys/dev/sbus/be.c:1.70 Fri Sep 18 14:00:44 2009
+++ src/sys/dev/sbus/be.c Fri Sep 18 14:09:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.70 2009/09/18 14:00:44 tsutsui Exp $ */
+/* $NetBSD: be.c,v 1.71 2009/09/18 14:09:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.70 2009/09/18 14:00:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.71 2009/09/18 14:09:42 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -483,7 +483,7 @@
int len, tlen = 0, boff = 0;
void *bp;
- bp = (char *)sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * BE_PKT_BUF_SZ;
+ bp = sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * BE_PKT_BUF_SZ;
for (; m; m = n) {
len = m->m_len;
@@ -514,7 +514,7 @@
int len, pad, boff = 0;
void *bp;
- bp = (char *)sc->sc_rb.rb_rxbuf + (idx % sc->sc_rb.rb_nrbuf) * BE_PKT_BUF_SZ;
+ bp = sc->sc_rb.rb_rxbuf + (idx % sc->sc_rb.rb_nrbuf) * BE_PKT_BUF_SZ;
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL)
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.53 src/sys/dev/sbus/qe.c:1.54
--- src/sys/dev/sbus/qe.c:1.53 Fri Sep 18 12:23:16 2009
+++ src/sys/dev/sbus/qe.c Fri Sep 18 14:09:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.53 2009/09/18 12:23:16 tsutsui Exp $ */
+/* $NetBSD: qe.c,v 1.54 2009/09/18 14:09:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.53 2009/09/18 12:23:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.54 2009/09/18 14:09:42 tsutsui Exp $");
#define QEDEBUG
@@ -334,7 +334,7 @@
int len, pad, boff = 0;
void *bp;
- bp = (char *)sc->sc_rb.rb_rxbuf + (idx % sc->sc_rb.rb_nrbuf) * QE_PKT_BUF_SZ;
+ bp = sc->sc_rb.rb_rxbuf + (idx % sc->sc_rb.rb_nrbuf) * QE_PKT_BUF_SZ;
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL)
@@ -383,7 +383,7 @@
int len, tlen = 0, boff = 0;
void *bp;
- bp = (char *)sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * QE_PKT_BUF_SZ;
+ bp = sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * QE_PKT_BUF_SZ;
for (; m; m = n) {
len = m->m_len;
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.47 src/sys/dev/sbus/qec.c:1.48
--- src/sys/dev/sbus/qec.c:1.47 Fri Sep 18 12:59:47 2009
+++ src/sys/dev/sbus/qec.c Fri Sep 18 14:09:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.47 2009/09/18 12:59:47 tsutsui Exp $ */
+/* $NetBSD: qec.c,v 1.48 2009/09/18 14:09:42 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.47 2009/09/18 12:59:47 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.48 2009/09/18 14:09:42 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -300,10 +300,10 @@
{
bus_addr_t txbufdma, rxbufdma;
bus_addr_t dma;
- void *p;
+ uint8_t *p;
unsigned int ntbuf, nrbuf, i;
- p = qr->rb_membase;
+ p = qr->rb_membase;
dma = qr->rb_dmabase;
ntbuf = qr->rb_ntbuf;
@@ -314,7 +314,7 @@
*/
qr->rb_txd = (struct qec_xd *)p;
qr->rb_txddma = dma;
- p = (char *)p + QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
+ p += QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
dma += QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
/*
@@ -322,7 +322,7 @@
*/
qr->rb_rxd = (struct qec_xd *)p;
qr->rb_rxddma = dma;
- p = (char *)p + QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
+ p += QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
dma += QEC_XD_RING_MAXSIZE * sizeof(struct qec_xd);
@@ -331,7 +331,7 @@
*/
qr->rb_txbuf = p;
txbufdma = dma;
- p = (char *)p + ntbuf * pktbufsz;
+ p += ntbuf * pktbufsz;
dma += ntbuf * pktbufsz;
/*
@@ -339,7 +339,7 @@
*/
qr->rb_rxbuf = p;
rxbufdma = dma;
- p = (char *)p + nrbuf * pktbufsz;
+ p += nrbuf * pktbufsz;
dma += nrbuf * pktbufsz;
/*
Index: src/sys/dev/sbus/qecvar.h
diff -u src/sys/dev/sbus/qecvar.h:1.12 src/sys/dev/sbus/qecvar.h:1.13
--- src/sys/dev/sbus/qecvar.h:1.12 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/qecvar.h Fri Sep 18 14:09:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qecvar.h,v 1.12 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: qecvar.h,v 1.13 2009/09/18 14:09:42 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,8 +53,8 @@
bus_addr_t rb_txddma; /* DMA address of same */
struct qec_xd *rb_rxd; /* Receive descriptors */
bus_addr_t rb_rxddma; /* DMA address of same */
- void * rb_txbuf; /* Transmit buffers */
- void * rb_rxbuf; /* Receive buffers */
+ uint8_t *rb_txbuf; /* Transmit buffers */
+ uint8_t *rb_rxbuf; /* Receive buffers */
int rb_ntbuf; /* # of transmit buffers */
int rb_nrbuf; /* # of receive buffers */
