Module Name: src
Committed By: msaitoh
Date: Tue Jul 7 06:27:37 UTC 2020
Modified Files:
src/sys/dev/pci: if_tl.c if_tlp_pci.c if_tlregs.h if_tlvar.h
Log Message:
No functional change:
- u_int32_t -> uint32_t
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/pci/if_tlp_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_tlregs.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_tlvar.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/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.121 src/sys/dev/pci/if_tl.c:1.122
--- src/sys/dev/pci/if_tl.c:1.121 Thu Jun 11 02:39:30 2020
+++ src/sys/dev/pci/if_tl.c Tue Jul 7 06:27:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.121 2020/06/11 02:39:30 thorpej Exp $ */
+/* $NetBSD: if_tl.c,v 1.122 2020/07/07 06:27:37 msaitoh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.121 2020/06/11 02:39:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.122 2020/07/07 06:27:37 msaitoh Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -645,7 +645,8 @@ tl_init(struct ifnet *ifp)
"tl-dma-page-boundary");
if (prop_boundary != NULL) {
KASSERT(prop_object_type(prop_boundary) == PROP_TYPE_NUMBER);
- boundary = (bus_size_t)prop_number_unsigned_value(prop_boundary);
+ boundary
+ = (bus_size_t)prop_number_unsigned_value(prop_boundary);
} else {
boundary = 0;
}
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.128 src/sys/dev/pci/if_tlp_pci.c:1.129
--- src/sys/dev/pci/if_tlp_pci.c:1.128 Thu Jul 2 09:07:10 2020
+++ src/sys/dev/pci/if_tlp_pci.c Tue Jul 7 06:27:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.129 2020/07/07 06:27:37 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.129 2020/07/07 06:27:37 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -659,7 +659,8 @@ tlp_pci_attach(device_t parent, device_t
for (i = 0; i < TULIP_ROM_SIZE(6); i++) {
if ((i % 8) == 0)
aprint_normal("\n\t");
- aprint_normal("0x%02x ", sc->sc_srom[i]);
+ aprint_normal("0x%02x ",
+ sc->sc_srom[i]);
}
aprint_normal("\n");
}
@@ -1545,7 +1546,7 @@ tlp_pci_adaptec_quirks(struct tulip_pci_
case 0x13:
strcpy(psc->sc_tulip.sc_name, "Cogent ???");
- sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
+ sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
psc->sc_flags |= TULIP_PCI_SHAREDINTR |
TULIP_PCI_SHAREDROM;
break;
Index: src/sys/dev/pci/if_tlregs.h
diff -u src/sys/dev/pci/if_tlregs.h:1.11 src/sys/dev/pci/if_tlregs.h:1.12
--- src/sys/dev/pci/if_tlregs.h:1.11 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/pci/if_tlregs.h Tue Jul 7 06:27:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlregs.h,v 1.11 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: if_tlregs.h,v 1.12 2020/07/07 06:27:37 msaitoh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -147,14 +147,14 @@
/* Linked lists for receive/transmit of datagrams */
struct tl_data_seg {
- u_int32_t data_count;
- u_int32_t data_addr;
+ uint32_t data_count;
+ uint32_t data_addr;
} __packed;
/* Receive list (one_frag = 1) */
struct tl_Rx_list {
- u_int32_t fwd;
- u_int32_t stat;
+ uint32_t fwd;
+ uint32_t stat;
struct tl_data_seg seg;
}__packed;
@@ -166,8 +166,8 @@ struct tl_Rx_list {
#define TL_NSEG 10
#define TL_LAST_SEG 0x80000000
struct tl_Tx_list {
- u_int32_t fwd;
- u_int32_t stat;
+ uint32_t fwd;
+ uint32_t stat;
struct tl_data_seg seg[TL_NSEG];
}__packed;
Index: src/sys/dev/pci/if_tlvar.h
diff -u src/sys/dev/pci/if_tlvar.h:1.17 src/sys/dev/pci/if_tlvar.h:1.18
--- src/sys/dev/pci/if_tlvar.h:1.17 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/pci/if_tlvar.h Tue Jul 7 06:27:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlvar.h,v 1.17 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: if_tlvar.h,v 1.18 2020/07/07 06:27:37 msaitoh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -35,7 +35,7 @@
#include <dev/i2c/i2cvar.h>
struct tl_product_desc {
- u_int32_t tp_product;
+ uint32_t tp_product;
int tp_tlphymedia;
const char *tp_desc;
};
@@ -50,7 +50,7 @@ struct tl_softc {
struct ethercom tl_ec;
struct callout tl_tick_ch; /* tick callout */
struct callout tl_restart_ch; /* restart callout */
- u_int8_t tl_enaddr[ETHER_ADDR_LEN]; /* hardware address */
+ uint8_t tl_enaddr[ETHER_ADDR_LEN]; /* hardware address */
struct i2c_controller sc_i2c; /* i2c controller info, for eeprom */
mii_data_t tl_mii; /* mii bus */
bus_dma_segment_t ctrl_segs; /* bus-dma memory for control blocks */
@@ -82,8 +82,8 @@ struct tl_softc {
#endif
krndsource_t rnd_source;
};
-#define tl_if tl_ec.ec_if
-#define tl_bpf tl_if.if_bpf
+#define tl_if tl_ec.ec_if
+#define tl_bpf tl_if.if_bpf
typedef struct tl_softc tl_softc_t;
typedef u_long ioctl_cmd_t;
