Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KNF. No functional change.

Browse Source
This commit is contained in:
msaitoh 2019-06-03 15:49:04 +00:00
parent 5ebbd3c42e
commit ef38b31a3e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/pci/if_sk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $ */
/* $NetBSD: if_sk.c,v 1.100 2019/06/03 15:49:04 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.100 2019/06/03 15:49:04 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -154,9 +154,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $");
#include <dev/pci/if_skvar.h>
int skc_probe(device_t, cfdata_t, void *);
void skc_attach(device_t, device_t, void *aux);
void skc_attach(device_t, device_t, void *);
int sk_probe(device_t, cfdata_t, void *);
void sk_attach(device_t, device_t, void *aux);
void sk_attach(device_t, device_t, void *);
int skcprint(void *, const char *);
int sk_intr(void *);
void sk_intr_bcom(struct sk_if_softc *);
@ -1162,7 +1162,8 @@ skc_probe(device_t parent, cfdata_t match, void *aux)
/*
* Force the GEnesis into reset, then bring it out of reset.
*/
void sk_reset(struct sk_softc *sc)
void
sk_reset(struct sk_softc *sc)
{
DPRINTFN(2, ("sk_reset\n"));
@ -1399,7 +1400,8 @@ sk_attach(device_t parent, device_t self, void *aux)
ifp = &sc_if->sk_ethercom.ec_if;
/* Try to allocate memory for jumbo buffers. */
if (sk_alloc_jumbo_mem(sc_if)) {
aprint_error("%s: jumbo buffer allocation failed\n", ifp->if_xname);
aprint_error("%s: jumbo buffer allocation failed\n",
ifp->if_xname);
goto fail;
}
sc_if->sk_ethercom.ec_capabilities = ETHERCAP_VLAN_MTU
@ -1648,8 +1650,8 @@ skc_attach(device_t parent, device_t self, void *aux)
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr, sc,
device_xname(sc->sk_dev));
sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr,
sc, device_xname(sc->sk_dev));
if (sc->sk_intrhand == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
@ -1854,7 +1856,8 @@ skc_attach(device_t parent, device_t self, void *aux)
sk_sysctl_handler, 0, (void *)sc,
0, CTL_HW, sk_root_num, sk_nodenum, CTL_CREATE,
CTL_EOL)) != 0) {
aprint_normal_dev(sc->sk_dev, "couldn't create int_mod sysctl node\n");
aprint_normal_dev(sc->sk_dev,
"couldn't create int_mod sysctl node\n");
goto fail_1;
}
@ -2617,7 +2620,8 @@ sk_unreset_yukon(struct sk_if_softc *sc_if)
sc->sk_rev >= SK_YUKON_LITE_REV_A3) {
/* Take PHY out of reset. */
sk_win_write_4(sc, SK_GPIO,
(sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9) & ~SK_GPIO_DAT9);
(sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9)
& ~SK_GPIO_DAT9);
}
/* GMAC and GPHY Reset */
@ -2697,7 +2701,7 @@ sk_init_yukon(struct sk_if_softc *sc_if)
/* transmit parameter register */
DPRINTFN(6, ("sk_init_yukon: 8\n"));
SK_YU_WRITE_2(sc_if, YUKON_TPR, YU_TPR_JAM_LEN(0x3) |
YU_TPR_JAM_IPG(0xb) | YU_TPR_JAM2DATA_IPG(0x1a) );
YU_TPR_JAM_IPG(0xb) | YU_TPR_JAM2DATA_IPG(0x1a));
/* serial mode register */
DPRINTFN(6, ("sk_init_yukon: 9\n"));
@ -3045,7 +3049,7 @@ void
sk_dump_txdesc(struct sk_tx_desc *desc, int idx)
{
#define DESC_PRINT(X) \
if (X) \
if (X) \
printf("txdesc[%d]." #X "=%#x\n", \
idx, X);