CVS commit: src/sys/dev/ic

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Sun Apr 26 02:25:57 UTC 2009

Modified Files:
        src/sys/dev/ic: rtl81x9.c rtl81x9var.h

Log Message:
- use (uint8_t *) for RX buffer
- remove unnecessary pointer casts


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/ic/rtl81x9.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/rtl81x9var.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/ic/rtl81x9.c
diff -u src/sys/dev/ic/rtl81x9.c:1.83 src/sys/dev/ic/rtl81x9.c:1.84
--- src/sys/dev/ic/rtl81x9.c:1.83	Sat Apr 25 18:27:39 2009
+++ src/sys/dev/ic/rtl81x9.c	Sun Apr 26 02:25:57 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9.c,v 1.83 2009/04/25 18:27:39 tsutsui Exp $	*/
+/*	$NetBSD: rtl81x9.c,v 1.84 2009/04/26 02:25:57 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.83 2009/04/25 18:27:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.84 2009/04/26 02:25:57 tsutsui Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -463,7 +463,7 @@
 		return rval;
 	}
 
-	memset((char *)&frame, 0, sizeof(frame));
+	memset(&frame, 0, sizeof(frame));
 
 	frame.mii_phyaddr = phy;
 	frame.mii_regaddr = reg;
@@ -509,7 +509,7 @@
 		return;
 	}
 
-	memset((char *)&frame, 0, sizeof(frame));
+	memset(&frame, 0, sizeof(frame));
 
 	frame.mii_phyaddr = phy;
 	frame.mii_regaddr = reg;
@@ -768,7 +768,7 @@
  fail_3:
 	bus_dmamap_destroy(sc->sc_dmat, sc->recv_dmamap);
  fail_2:
-	bus_dmamem_unmap(sc->sc_dmat, (void *)sc->rtk_rx_buf,
+	bus_dmamem_unmap(sc->sc_dmat, sc->rtk_rx_buf,
 	    RTK_RXBUFLEN + 16);
  fail_1:
 	bus_dmamem_free(sc->sc_dmat, &sc->sc_dmaseg, sc->sc_dmanseg);
@@ -862,7 +862,7 @@
 			bus_dmamap_destroy(sc->sc_dmat, txd->txd_dmamap);
 	}
 	bus_dmamap_destroy(sc->sc_dmat, sc->recv_dmamap);
-	bus_dmamem_unmap(sc->sc_dmat, (void *)sc->rtk_rx_buf,
+	bus_dmamem_unmap(sc->sc_dmat, sc->rtk_rx_buf,
 	    RTK_RXBUFLEN + 16);
 	bus_dmamem_free(sc->sc_dmat, &sc->sc_dmaseg, sc->sc_dmanseg);
 
@@ -927,7 +927,7 @@
 {
 	struct mbuf *m;
 	struct ifnet *ifp;
-	char *rxbufpos, *dst;
+	uint8_t *rxbufpos, *dst;
 	u_int total_len, wrap;
 	uint32_t rxstat;
 	uint16_t cur_rx, new_rx;
@@ -948,7 +948,7 @@
 	rx_bytes = 0;
 
 	while ((CSR_READ_1(sc, RTK_COMMAND) & RTK_CMD_EMPTY_RXBUF) == 0) {
-		rxbufpos = (char *)sc->rtk_rx_buf + cur_rx;
+		rxbufpos = sc->rtk_rx_buf + cur_rx;
 		bus_dmamap_sync(sc->sc_dmat, sc->recv_dmamap, cur_rx,
 		    RTK_RXSTAT_LEN, BUS_DMASYNC_POSTREAD);
 		rxstat = le32toh(*(uint32_t *)rxbufpos);
@@ -1013,7 +1013,7 @@
 		 * of the Rx area, if necessary.
 		 */
 		cur_rx = (cur_rx + RTK_RXSTAT_LEN) % RTK_RXBUFLEN;
-		rxbufpos = (char *)sc->rtk_rx_buf + cur_rx;
+		rxbufpos = sc->rtk_rx_buf + cur_rx;
 
 		/*
 		 * Compute the number of bytes at which the packet

Index: src/sys/dev/ic/rtl81x9var.h
diff -u src/sys/dev/ic/rtl81x9var.h:1.45 src/sys/dev/ic/rtl81x9var.h:1.46
--- src/sys/dev/ic/rtl81x9var.h:1.45	Sat Mar 21 10:05:28 2009
+++ src/sys/dev/ic/rtl81x9var.h	Sun Apr 26 02:25:57 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9var.h,v 1.45 2009/03/21 10:05:28 tsutsui Exp $	*/
+/*	$NetBSD: rtl81x9var.h,v 1.46 2009/04/26 02:25:57 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -199,7 +199,7 @@
 	int			sc_dmanseg;	/* for rtk(4) */
 
 	bus_dmamap_t 		recv_dmamap;	/* for rtk(4) */
-	void *			rtk_rx_buf;
+	uint8_t			*rtk_rx_buf;
 
 	struct rtk_tx_desc	rtk_tx_descs[RTK_TX_LIST_CNT];
 	SIMPLEQ_HEAD(, rtk_tx_desc) rtk_tx_free;