[src/netbsd-2-0]: src/sys/dev/ic Pull up revision 1.46 (requested by toshii i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e2800f7aa2a
branches:  netbsd-2-0
changeset: 561490:5e2800f7aa2a
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 21 16:39:00 2004 +0000

description:
Pull up revision 1.46 (requested by toshii in ticket #517):
A couple of changes for adding re(4) (Realtek gigabit ethernet):
  - add necessary members in rtk_softc
  - make functions used by re(4) non-static

diffstat:

 sys/dev/ic/rtl81x9.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 3192446cc122 -r 5e2800f7aa2a sys/dev/ic/rtl81x9.c
--- a/sys/dev/ic/rtl81x9.c      Mon Jun 21 10:25:18 2004 +0000
+++ b/sys/dev/ic/rtl81x9.c      Mon Jun 21 16:39:00 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtl81x9.c,v 1.45 2003/02/21 17:14:07 tsutsui Exp $     */
+/*     $NetBSD: rtl81x9.c,v 1.45.4.1 2004/06/21 16:39:00 tron Exp $    */
 
 /*
  * Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.45 2003/02/21 17:14:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.45.4.1 2004/06/21 16:39:00 tron Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -144,7 +144,6 @@
 STATIC int rtk_ifmedia_upd     __P((struct ifnet *));
 STATIC void rtk_ifmedia_sts    __P((struct ifnet *, struct ifmediareq *));
 
-STATIC u_int16_t rtk_read_eeprom __P((struct rtk_softc *, int, int));
 STATIC void rtk_eeprom_putbyte __P((struct rtk_softc *, int, int));
 STATIC void rtk_mii_sync       __P((struct rtk_softc *));
 STATIC void rtk_mii_send       __P((struct rtk_softc *, u_int32_t, int));
@@ -160,7 +159,6 @@
 STATIC void rtk_disable                __P((struct rtk_softc *));
 STATIC void rtk_power          __P((int, void *));
 
-STATIC void rtk_setmulti       __P((struct rtk_softc *));
 STATIC int rtk_list_tx_init    __P((struct rtk_softc *));
 
 #define EE_SET(x)                                      \
@@ -544,7 +542,7 @@
 /*
  * Program the 64-bit multicast hash filter.
  */
-STATIC void rtk_setmulti(sc)
+void rtk_setmulti(sc)
        struct rtk_softc        *sc;
 {
        struct ifnet            *ifp;