 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_le_mca.c,v 1.19 2010/11/13 13:52:04 uebayasi Exp $	*/
+/*	$NetBSD: if_le_mca.c,v 1.20 2019/04/09 03:56:08 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -35,27 +35,27 @@
+ *
  * Syskonnect was very helpful and provided docs for these cards promptly.
  * I wish all vendors would be like that!
  * I'd like to thank to Alfred Arnold, author of the Linux driver, for
  * giving me contact to The Right Syskonnect person, too :-)
+ *
  * Sources:
  * SKNET MC+ Technical Manual, version 1.1, July 21 1993
  * SKNET personal Technisches Manual, version 1.2, April 14 1988
  * SKNET junior Technisches Manual, version 1.0, July 14 1987
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.19 2010/11/13 13:52:04 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.20 2019/04/09 03:56:08 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #include <sys/cpu.h>
 @@ -63,76 +63,76 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,
 #include <sys/bus.h>
 #include <dev/ic/lancereg.h>
 #include <dev/ic/lancevar.h>
 #include <dev/ic/am7990reg.h>
 #include <dev/ic/am7990var.h>
 #include <dev/mca/mcareg.h>
 #include <dev/mca/mcavar.h>
 #include <dev/mca/mcadevs.h>
 #include <dev/mca/if_lereg.h>
 int 	le_mca_match(device_t, cfdata_t, void *);
 void	le_mca_attach(device_t, device_t, void *);
 struct le_mca_softc {
 	struct	am7990_softc sc_am7990;	/* glue to MI code */
 	void	*sc_ih;
 	bus_space_tag_t sc_memt;
 	bus_space_handle_t sc_memh;
 };
-static void le_mca_wrcsr(struct lance_softc *, uint16_t, uint16_t);
+static int 	le_mca_match(device_t, cfdata_t, void *);
-static uint16_t le_mca_rdcsr(struct lance_softc *, uint16_t);
+static void	le_mca_attach(device_t, device_t, void *);
 static void le_mca_hwreset(struct lance_softc *);
-static int le_mca_intredge(void *);
+static void	le_mca_wrcsr(struct lance_softc *, uint16_t, uint16_t);
 static uint16_t	le_mca_rdcsr(struct lance_softc *, uint16_t);
 static void	le_mca_hwreset(struct lance_softc *);
 static int	le_mca_intredge(void *);
 static void	le_mca_copytobuf(struct lance_softc *, void *, int, int);
 static void	le_mca_copyfrombuf(struct lance_softc *, void *, int, int);
 static void	le_mca_zerobuf(struct lance_softc *, int, int);
 static inline void le_mca_wrreg(struct le_mca_softc *, int, int);
 #define le_mca_set_RAP(sc, reg_number) \
 		le_mca_wrreg(sc, reg_number, RAP | REGWRITE)
 CFATTACH_DECL_NEW(le_mca, sizeof(struct le_mca_softc),
     le_mca_match, le_mca_attach, NULL, NULL);
 /* SKNET MC+ POS mapping */
-static const u_int8_t sknet_mcp_irq[] = {
+static const uint8_t sknet_mcp_irq[] = {
 , 5, 10, 11
 };
-static const u_int8_t sknet_mcp_media[] = {
+static const uint8_t sknet_mcp_media[] = {
-	IFM_ETHER|IFM_10_2,
+	IFM_ETHER | IFM_10_2,
-	IFM_ETHER|IFM_10_T,
+	IFM_ETHER | IFM_10_T,
-	IFM_ETHER|IFM_10_5,
+	IFM_ETHER | IFM_10_5,
 };
 int
 le_mca_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mca_attach_args *ma = aux;
 	switch(ma->ma_id) {
 	case MCA_PRODUCT_SKNETPER:
 	case MCA_PRODUCT_SKNETG:
-		return (1);
+		return 1;
+	}
-	return (0);
+	return 0;
+}
 void
 le_mca_attach(device_t parent, device_t self, void *aux)
+{
 	struct le_mca_softc *lesc = device_private(self);
 	struct lance_softc *sc = &lesc->sc_am7990.lsc;
 	struct mca_attach_args *ma = aux;
 	int i, pos2, pos3, pos4, irq, membase, supmedia=0;
 	const char *typestr;
 	sc->sc_dev = self;
 @@ -271,30 +271,30 @@ le_mca_attach(device_t parent, device_t
 /*
  * Controller interrupt.
  */
 int
 le_mca_intredge(void *arg)
+{
 	/*
 	 * We could check the IRQ bit of LE_PORT, but it seems to be unset
 	 * at this time anyway.
 	 */
 	if (am7990_intr(arg) == 0)
-		return (0);
+		return 0;
 	for(;;)
 		if (am7990_intr(arg) == 0)
-			return (1);
+			return 1;
+}
 /*
  * Push a value to LANCE controller.
  */
 static inline void
 le_mca_wrreg(struct le_mca_softc *sc, int val, int type)
+{
 	/*
 	 * This follows steps in SKNET Personal/MC2+ docs:
 	 * 1. write reg. number to LANCE register
 	 * 2. write value RESET | type to port
 @@ -338,34 +338,31 @@ le_mca_hwreset(struct lance_softc *sc)
+{
 	struct le_mca_softc *lsc = (struct le_mca_softc *)sc;
 	bus_space_write_1(lsc->sc_memt, lsc->sc_memh, LE_PORT, 0);
 	delay(5);	/* Delay >= 5 microseconds */
 	bus_space_write_1(lsc->sc_memt, lsc->sc_memh, LE_PORT, RESET);
+}
 static void
 le_mca_copytobuf(struct lance_softc *sc, void *from, int boff, int len)
+{
 	struct le_mca_softc *lsc = (struct le_mca_softc *)sc;
-	bus_space_write_region_1(lsc->sc_memt, lsc->sc_memh, boff,
+	bus_space_write_region_1(lsc->sc_memt, lsc->sc_memh, boff, from, len);
 	    from, len);
+}
 static void
 le_mca_copyfrombuf(struct lance_softc *sc, void *to, int boff, int len)
+{
 	struct le_mca_softc *lsc = (struct le_mca_softc *)sc;
-	bus_space_read_region_1(lsc->sc_memt, lsc->sc_memh, boff,
+	bus_space_read_region_1(lsc->sc_memt, lsc->sc_memh, boff, to, len);
 	    to, len);
+}
 static void
 le_mca_zerobuf(struct lance_softc *sc, int boff, int len)
+{
 	struct le_mca_softc *lsc = (struct le_mca_softc *)sc;
-	bus_space_set_region_1(lsc->sc_memt, lsc->sc_memh, boff,
+	bus_space_set_region_1(lsc->sc_memt, lsc->sc_memh, boff, 0x00, len);
 x00, len);
+}