 @@ -1,14 +1,14 @@
-/*	$NetBSD: am79900reg.h,v 1.9 2008/04/28 20:23:49 martin Exp $	*/
+/*	$NetBSD: am79900reg.h,v 1.10 2019/10/11 14:22:46 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -86,42 +86,42 @@ struct letmd {
 /*
  * Initialization block
  */
 struct leinit {
 	u_int32_t init_mode;		/* +0x0000 */
 	u_int32_t init_padr[2];		/* +0x0002 */
 	u_int16_t init_ladrf[4];	/* +0x0008 */
 	u_int32_t init_rdra;		/* +0x0010 */
 	u_int32_t init_tdra;		/* +0x0014 */
 	int32_t	  pad;		/* Pad to 16 shorts */
 };
 /* Receive message descriptor 1 (rmd1_bits) */
-#define	LE_R1_OWN	(1<<31)		/* LANCE owns the packet */
+#define	LE_R1_OWN	(1U<<31)	/* LANCE owns the packet */
 #define	LE_R1_ERR	(1<<30)		/* error summary */
 #define	LE_R1_FRAM	(1<<29)		/* framing error */
 #define	LE_R1_OFLO	(1<<28)		/* overflow error */
 #define	LE_R1_CRC	(1<<27)		/* CRC error */
 #define	LE_R1_BUFF	(1<<26)		/* buffer error */
 #define	LE_R1_STP	(1<<25)		/* start of packet */
 #define	LE_R1_ENP	(1<<24)		/* end of packet */
 #define	LE_R1_ONES	(0xf<<12)	/* must be ones */
 #define	LE_R1_BCNT_MASK	(0xfff)		/* byte count mask */
 #define	LE_R1_BITS \
     "\20\40OWN\37ERR\36FRAM\35OFLO\34CRC\33BUFF\32STP\31ENP"
 /* Transmit message descriptor 1 (tmd1_bits) */
-#define	LE_T1_OWN	(1<<31)		/* LANCE owns the packet */
+#define	LE_T1_OWN	(1U<<31)	/* LANCE owns the packet */
 #define	LE_T1_ERR	(1<<30)		/* error summary */
 #define	LE_T1_ADD_FCS	(1<<29)		/* add FCS (PCnet-PCI) */
 #define	LE_T1_NO_FCS	(1<<29)		/* no FCS (ILACC) */
 #define	LE_T1_MORE	(1<<28)		/* multiple collisions */
 #define	LE_T1_LTINT	(1<<28)		/* transmit interrupt (if LTINTEN) */
 #define	LE_T1_ONE	(1<<27)		/* single collision */
 #define	LE_T1_DEF	(1<<26)		/* deferred transmit */
 #define	LE_T1_STP	(1<<25)		/* start of packet */
 #define	LE_T1_ENP	(1<<24)		/* end of packet */
 #define	LE_T1_ONES	(0xf<<12)	/* must be ones */
 #define	LE_T1_BCNT_MASK	(0xfff)		/* byte count mask */
 #define	LE_T1_BITS \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_pcn.c,v 1.71 2019/05/28 07:41:49 msaitoh Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.72 2019/10/11 14:22:46 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -55,27 +55,27 @@
  *	  Ethernet Controller with Integrated PHY
+ *
  * This also supports the virtual PCnet-PCI Ethernet interface found
  * in VMware.
+ *
  * TODO:
+ *
  *	* Split this into bus-specific and bus-independent portions.
  *	  The core could also be used for the ILACC (Am79900) 32-bit
  *	  Ethernet chip (XXX only if we use an ILACC-compatible SWSTYLE).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.71 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.72 2019/10/11 14:22:46 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -1698,32 +1698,33 @@ pcn_init(struct ifnet *ifp)
 		 */
 		pcn_bcr_write(sc, LE_BCR32,
 		    pcn_bcr_read(sc, LE_BCR32) | LE_B32_DANAS);
+	}
 	/*
 	 * Set the Tx and Rx descriptor ring addresses in the init
 	 * block, the TLEN and RLEN other fields of the init block
 	 * MODE register.
 	 */
 	sc->sc_initblock.init_rdra = htole32(PCN_CDRXADDR(sc, 0));
 	sc->sc_initblock.init_tdra = htole32(PCN_CDTXADDR(sc, 0));
 	sc->sc_initblock.init_mode = htole32(sc->sc_mode |
-	    ((ffs(PCN_NTXDESC) - 1) << 28) |
+	    (((uint32_t)ffs(PCN_NTXDESC) - 1) << 28) |
 	    ((ffs(PCN_NRXDESC) - 1) << 20));
 	/* Set the station address in the init block. */
 	sc->sc_initblock.init_padr[0] = htole32(enaddr[0] |
-	    (enaddr[1] << 8) | (enaddr[2] << 16) | (enaddr[3] << 24));
+	    (enaddr[1] << 8) | (enaddr[2] << 16) |
 	    ((uint32_t)enaddr[3] << 24));
 	sc->sc_initblock.init_padr[1] = htole32(enaddr[4] |
 	    (enaddr[5] << 8));
 	/* Set the multicast filter in the init block. */
 	pcn_set_filter(sc);
 	/* Initialize CSR3. */
 	pcn_csr_write(sc, LE_CSR3, LE_C3_MISSM | LE_C3_IDONM | LE_C3_DXSUFLO);
 	/* Initialize CSR4. */
 	pcn_csr_write(sc, LE_CSR4, LE_C4_DMAPLUS | LE_C4_APAD_XMT |
 	    LE_C4_MFCOM | LE_C4_RCVCCOM | LE_C4_TXSTRTM);