Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amd64/conf Add config goo for ath. Tested with a P...



details:   https://anonhg.NetBSD.org/src/rev/45e862ab3e4e
branches:  trunk
changeset: 582966:45e862ab3e4e
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Tue Jul 12 20:22:45 2005 +0000

description:
Add config goo for ath.  Tested with a PCI card, detected as:

        ath0 at pci0 dev 10 function 0
        ath0: interrupting at ioapic0 pin 17 (irq 5)
        ath0: 11a rates: 6Mbps 9Mbps 12Mbps 18Mbps 24Mbps 36Mbps 48Mbps 54Mbps
        ath0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps
        ath0: 11g rates: 1Mbps 2Mbps 5.5Mbps 11Mbps 6Mbps 9Mbps 12Mbps 18Mbps 24Mbps 36M bps 48Mbps 54Mbps
        ath0: mac 5.9 phy 4.3 radio 3.6

Cardbus untested, so it is commented out.

diffstat:

 sys/arch/amd64/conf/GENERIC        |   6 ++++--
 sys/arch/amd64/conf/INSTALL        |   6 ++++--
 sys/arch/amd64/conf/INSTALL_ACPI   |   6 ++++--
 sys/arch/amd64/conf/Makefile.amd64 |  21 ++++++++++++++++++++-
 sys/arch/amd64/conf/files.amd64    |   5 ++++-
 5 files changed, 36 insertions(+), 8 deletions(-)

diffs (154 lines):

diff -r d10adf7985fe -r 45e862ab3e4e sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Jul 12 19:17:37 2005 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Jul 12 20:22:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.57 2005/07/11 15:37:04 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.58 2005/07/12 20:22:45 sekiya Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.57 $"
+#ident                 "GENERIC-$Revision: 1.58 $"
 
 maxusers       32              # estimated number of users
 
@@ -498,6 +498,7 @@
 
 # PCI network interfaces
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 bce*   at pci? dev ? function ?        # Broadcom 440x 10/100 Ethernet
 bge*   at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
 en*    at pci? dev ? function ?        # ENI/Adaptec ATM
@@ -550,6 +551,7 @@
 #sm*   at mhzc?
 
 # CardBus network cards
+#ath*  at cardbus? dev ? function ?    # Atheros 5210/5211/5212 802.11
 #ex*   at cardbus? dev ? function ?    # 3Com 3C575TX
 #fxp*  at cardbus? dev ? function ?    # Intel i8255x
 #rtk*  at cardbus? dev ? function ?    # Realtek 8129/8139
diff -r d10adf7985fe -r 45e862ab3e4e sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL       Tue Jul 12 19:17:37 2005 +0000
+++ b/sys/arch/amd64/conf/INSTALL       Tue Jul 12 20:22:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.35 2005/07/07 17:05:46 tron Exp $
+# $NetBSD: INSTALL,v 1.36 2005/07/12 20:22:45 sekiya Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include        "arch/amd64/conf/std.amd64"
 
-#ident                 "INSTALL-$Revision: 1.35 $"
+#ident                 "INSTALL-$Revision: 1.36 $"
 
 maxusers       32              # estimated number of users
 
@@ -404,6 +404,7 @@
 
 # PCI network interfaces
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 bce*   at pci? dev ? function ?        # Broadcom 4401 10/100 Ethernet
 bge*   at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
 en*    at pci? dev ? function ?        # ENI/Adaptec ATM
@@ -453,6 +454,7 @@
 #sm*   at mhzc?
 
 # CardBus network cards
+#ath*  at cardbus? dev ? function ?    # Atheros 5210/5211/5212 802.11
 #ex*   at cardbus? dev ? function ?    # 3Com 3C575TX
 #fxp*  at cardbus? dev ? function ?    # Intel i8255x
 #rtk*  at cardbus? dev ? function ?    # Realtek 8129/8139
diff -r d10adf7985fe -r 45e862ab3e4e sys/arch/amd64/conf/INSTALL_ACPI
--- a/sys/arch/amd64/conf/INSTALL_ACPI  Tue Jul 12 19:17:37 2005 +0000
+++ b/sys/arch/amd64/conf/INSTALL_ACPI  Tue Jul 12 20:22:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_ACPI,v 1.24 2005/07/07 17:05:46 tron Exp $
+# $NetBSD: INSTALL_ACPI,v 1.25 2005/07/12 20:22:45 sekiya Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include        "arch/amd64/conf/std.amd64"
 
-#ident                 "INSTALL-$Revision: 1.24 $"
+#ident                 "INSTALL-$Revision: 1.25 $"
 
 maxusers       32              # estimated number of users
 
@@ -398,6 +398,7 @@
 
 # PCI network interfaces
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 bge*   at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
 en*    at pci? dev ? function ?        # ENI/Adaptec ATM
 ep*    at pci? dev ? function ?        # 3Com 3c59x
@@ -445,6 +446,7 @@
 #sm*   at mhzc?
 
 # CardBus network cards
+#ath*  at cardbus? dev ? function ?    # Atheros 5210/5211/5212 802.11
 #ex*   at cardbus? dev ? function ?    # 3Com 3C575TX
 #fxp*  at cardbus? dev ? function ?    # Intel i8255x
 #rtk*  at cardbus? dev ? function ?    # Realtek 8129/8139
diff -r d10adf7985fe -r 45e862ab3e4e sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Tue Jul 12 19:17:37 2005 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Tue Jul 12 20:22:45 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amd64,v 1.6 2005/05/31 04:03:09 christos Exp $
+#      $NetBSD: Makefile.amd64,v 1.7 2005/07/12 20:22:45 sekiya Exp $
 
 # Makefile for NetBSD
 #
@@ -103,6 +103,25 @@
 
 %RULES
 
+# XXX -        Ugly, but make doesn't easily handle .o.uue (assumes it's a suffix)
+# XXX -        Also, config has no simple was to just add foo.o to the Makefile.
+#      It needs a pathname of some sort for "object"
+.if !empty(OBJS:M\/athhal-x86_64-elf.hal.o)
+OBJS:=${OBJS:C/\/athhal-x86_64-elf.hal.o/athhal-x86_64-elf.hal.o/}
+
+.PATH: $S/contrib/arch/amd64/dev
+ATH_UUDEC?=    @${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
+               ${_MKSHECHO}\
+               ${UUDECODE} -p $> \> ${.TARGET}; \
+               rm -f ${.TARGET}; \
+               ${UUDECODE} -p $> > ${.TARGET}
+athhal-x86_64-elf.hal.o: athhal-x86_64-elf.hal.o.uue
+       ${ATH_UUDEC}
+all depend:    opt_ah.h
+opt_ah.h:      athhal-x86_64-elf.opt_ah.h
+       ln -s ${.ALLSRC} ${.TARGET}
+.endif
+
 ##
 ## (9) port independent kernel machinery
 ##
diff -r d10adf7985fe -r 45e862ab3e4e sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64   Tue Jul 12 19:17:37 2005 +0000
+++ b/sys/arch/amd64/conf/files.amd64   Tue Jul 12 20:22:45 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amd64,v 1.16 2005/05/15 22:20:23 fvdl Exp $
+#      $NetBSD: files.amd64,v 1.17 2005/07/12 20:22:45 sekiya Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -179,4 +179,7 @@
 include "dev/acpi/files.acpi"
 file   arch/amd64/acpi/acpi_wakeup.c   acpi
 
+# Atheros 5210/5211/5212 Hardware Abstraction Layer (HAL)
+object /athhal-x86_64-elf.hal.o        ath
+
 include        "arch/amd64/conf/majors.amd64"



Home | Main Index | Thread Index | Old Index