Module Name: src
Committed By: tsutsui
Date: Sat Sep 5 03:50:50 UTC 2009
Modified Files:
src/sys/dev/ic: rtl8169.c rtl81x9reg.h rtl81x9var.h
Log Message:
Remove unnecessary whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/rtl81x9reg.h
cvs rdiff -u -r1.48 -r1.49 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/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.125 src/sys/dev/ic/rtl8169.c:1.126
--- src/sys/dev/ic/rtl8169.c:1.125 Wed Sep 2 15:11:13 2009
+++ src/sys/dev/ic/rtl8169.c Sat Sep 5 03:50:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.125 2009/09/02 15:11:13 tsutsui Exp $ */
+/* $NetBSD: rtl8169.c,v 1.126 2009/09/05 03:50:49 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.125 2009/09/02 15:11:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.126 2009/09/05 03:50:49 tsutsui Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -82,7 +82,7 @@
*
* o Jumbo frames
*
- * o GMII and TBI ports/registers for interfacing with copper
+ * o GMII and TBI ports/registers for interfacing with copper
* or fiber PHYs
*
* o RX and TX DMA rings can have up to 1024 descriptors
@@ -590,7 +590,7 @@
RTKQ_MACSTAT | RTKQ_CMDSTOP;
/*
* From FreeBSD driver:
- *
+ *
* These (8168/8111) controllers support jumbo frame
* but it seems that enabling it requires touching
* additional magic registers. Depending on MAC
@@ -690,7 +690,7 @@
BUS_DMA_COHERENT | BUS_DMA_NOWAIT)) != 0) {
aprint_error_dev(sc->sc_dev,
"can't map tx list, error = %d\n", error);
- goto fail_1;
+ goto fail_1;
}
memset(sc->re_ldata.re_tx_list, 0, RE_TX_LIST_SZ(sc));
Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.39 src/sys/dev/ic/rtl81x9reg.h:1.40
--- src/sys/dev/ic/rtl81x9reg.h:1.39 Mon May 11 15:42:33 2009
+++ src/sys/dev/ic/rtl81x9reg.h Sat Sep 5 03:50:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.39 2009/05/11 15:42:33 tsutsui Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.40 2009/09/05 03:50:49 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -126,8 +126,8 @@
#define RTK_GTXSTART 0x0038 /* 8 bits */
#define RTK_TIMERINT_8169 0x0058 /* different offset than 8139 */
#define RTK_PHYAR 0x0060
-#define RTK_CSIDR 0x0064
-#define RTK_CSIAR 0x0068
+#define RTK_CSIDR 0x0064
+#define RTK_CSIAR 0x0068
#define RTK_TBI_LPAR 0x006A
#define RTK_GMEDIASTAT 0x006C /* 8 bits */
#define RTK_EPHYAR 0x0080
@@ -205,7 +205,7 @@
#define RTK_TXSTAT_TXABRT 0x40000000
#define RTK_TXSTAT_CARRLOSS 0x80000000
-#define RTK_TXSTAT_THRESH(x) (((x) << 16) & RTK_TXSTAT_EARLY_THRESH)
+#define RTK_TXSTAT_THRESH(x) (((x) << 16) & RTK_TXSTAT_EARLY_THRESH)
#define RTK_TXTH_256 8 /* (x) * 32 bytes */
#define RTK_TXTH_1536 48
@@ -451,7 +451,7 @@
#define RTK_RX_MAXDMA RTK_RXDMA_256BYTES
#define RTK_TX_MAXDMA RTK_TXDMA_256BYTES
-#define RTK_RXCFG_CONFIG (RTK_RX_FIFOTHRESH|RTK_RX_MAXDMA|RTK_RX_BUF_SZ)
+#define RTK_RXCFG_CONFIG (RTK_RX_FIFOTHRESH|RTK_RX_MAXDMA|RTK_RX_BUF_SZ)
#define RTK_TXCFG_CONFIG (RTK_TXCFG_IFG|RTK_TX_MAXDMA)
#define RE_RX_FIFOTHRESH RTK_RXFIFO_NOTHRESH
Index: src/sys/dev/ic/rtl81x9var.h
diff -u src/sys/dev/ic/rtl81x9var.h:1.48 src/sys/dev/ic/rtl81x9var.h:1.49
--- src/sys/dev/ic/rtl81x9var.h:1.48 Tue May 12 14:25:18 2009
+++ src/sys/dev/ic/rtl81x9var.h Sat Sep 5 03:50:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9var.h,v 1.48 2009/05/12 14:25:18 cegger Exp $ */
+/* $NetBSD: rtl81x9var.h,v 1.49 2009/09/05 03:50:49 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -90,12 +90,12 @@
* Instead, there are only four register sets, each or which represents
* one 'descriptor.' Basically, each TX descriptor is just a contiguous
* packet buffer (32-bit aligned!) and we place the buffer addresses in
- * the registers so the chip knows where they are.
- *
+ * the registers so the chip knows where they are.
+ *
* We can sort of kludge together the same kind of buffer management
* used in previous drivers, but we have to do buffer copies almost all
* the time, so it doesn't really buy us much.
- *
+ *
* For reception, there's just one large buffer where the chip stores
* all received packets.
*/
@@ -157,14 +157,14 @@
int re_tx_free; /* # of free descriptors */
int re_tx_nextfree; /* next descriptor to use */
int re_tx_desc_cnt; /* # of descriptors */
- bus_dma_segment_t re_tx_listseg;
+ bus_dma_segment_t re_tx_listseg;
int re_tx_listnseg;
struct re_rxsoft re_rxsoft[RE_RX_DESC_CNT];
bus_dmamap_t re_rx_list_map;
struct re_desc *re_rx_list;
int re_rx_prodidx;
- bus_dma_segment_t re_rx_listseg;
+ bus_dma_segment_t re_rx_listseg;
int re_rx_listnseg;
};
@@ -195,12 +195,12 @@
#define RTKQ_MACSTAT 0x00000100 /* set MACSTAT_DIS on init */
#define RTKQ_CMDSTOP 0x00000200 /* set STOPREQ on stop */
- bus_dma_tag_t sc_dmat;
+ bus_dma_tag_t sc_dmat;
- bus_dma_segment_t sc_dmaseg; /* for rtk(4) */
+ bus_dma_segment_t sc_dmaseg; /* for rtk(4) */
int sc_dmanseg; /* for rtk(4) */
- bus_dmamap_t recv_dmamap; /* for rtk(4) */
+ bus_dmamap_t recv_dmamap; /* for rtk(4) */
uint8_t *rtk_rx_buf;
struct rtk_tx_desc rtk_tx_descs[RTK_TX_LIST_CNT];
@@ -254,7 +254,7 @@
/*
* re(4) hardware ip4csum-tx could be mangled with 28 byte or less IP packets
*/
-#define RE_IP4CSUMTX_MINLEN 28
+#define RE_IP4CSUMTX_MINLEN 28
#define RE_IP4CSUMTX_PADLEN (ETHER_HDR_LEN + RE_IP4CSUMTX_MINLEN)
/*
* XXX
