Date: Fri, 16 May 2008 21:57:03 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141737 for review Message-ID: <200805162157.m4GLv3ln083611@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141737 Change 141737 by thompsa@thompsa_burger on 2008/05/16 21:56:07 After talking to Sam its not a simple case of forgetting to commit dev/ral/rt2860.* along with the build glue, the driver needs more work. Instead just revert the build hooks for the 2860 for the time being. Affected files ... .. //depot/projects/vap/sys/conf/files#39 edit .. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#10 edit .. //depot/projects/vap/sys/i386/conf/GENERIC#16 edit .. //depot/projects/vap/sys/modules/Makefile#28 edit .. //depot/projects/vap/sys/modules/ralfw/Makefile#4 edit Differences ... ==== //depot/projects/vap/sys/conf/files#39 (text+ko) ==== @@ -1030,7 +1030,6 @@ dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral -dev/ral/rt2860.c optional ral dev/ral/if_ral_pci.c optional ral pci rt2561fw.c optional rt2561fw | ralfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \ @@ -1074,20 +1073,6 @@ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \ no-obj no-implicit-rule \ clean "rt2661.fw" -rt2860fw.c optional rt2860fw | ralfw \ - compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \ - no-implicit-rule before-depend local \ - clean "rt2860fw.c" -rt2860fw.fwo optional rt2860fw | ralfw \ - dependency "rt2860.fw" \ - compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \ - no-implicit-rule \ - clean "rt2860.fwo" -rt2860.fw optional rt2860fw | ralfw \ - dependency ".PHONY" \ - compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \ - no-obj no-implicit-rule \ - clean "rt2860.fw" dev/random/harvest.c standard dev/random/hash.c optional random dev/random/probe.c optional random ==== //depot/projects/vap/sys/dev/ral/if_ral_pci.c#10 (text+ko) ==== @@ -19,7 +19,7 @@ __FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.7 2007/06/11 03:36:52 sam Exp $"); /* - * PCI/Cardbus front-end for the Ralink RT256x/RT2661/RT2860 driver. + * PCI/Cardbus front-end for the Ralink RT256x/RT2661 driver. */ #include <sys/param.h> @@ -55,7 +55,6 @@ #include <dev/ral/rt2560var.h> #include <dev/ral/rt2661var.h> -#include <dev/ral/rt2860var.h> MODULE_DEPEND(ral, pci, 1, 1, 1); MODULE_DEPEND(ral, firmware, 1, 1, 1); @@ -84,13 +83,6 @@ rt2661_suspend, rt2661_resume, rt2661_intr -}, ral_rt2860_opns = { - rt2860_attach, - rt2860_detach, - rt2860_shutdown, - rt2860_suspend, - rt2860_resume, - rt2860_intr }; struct ral_pci_ident { @@ -105,10 +97,6 @@ { 0x1814, 0x0301, &ral_rt2560_opns, "Ralink Technology RT2561S" }, { 0x1814, 0x0302, &ral_rt2560_opns, "Ralink Technology RT2561" }, { 0x1814, 0x0401, &ral_rt2661_opns, "Ralink Technology RT2661" }, - { 0x1814, 0x0601, &ral_rt2860_opns, "Ralink Technology RT2860" }, - { 0x1814, 0x0681, &ral_rt2860_opns, "Ralink Technology RT2860E" }, - { 0x1814, 0x0701, &ral_rt2860_opns, "Ralink Technology RT2860" }, - { 0x1814, 0x0801, &ral_rt2860_opns, "Ralink Technology RT2860" }, { 0, 0, NULL } }; @@ -117,7 +105,6 @@ union { struct rt2560_softc sc_rt2560; struct rt2661_softc sc_rt2661; - struct rt2860_softc sc_rt2860; } u; struct ral_opns *sc_opns; ==== //depot/projects/vap/sys/i386/conf/GENERIC#16 (text+ko) ==== @@ -259,7 +259,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath -#device ral # Ralink Technology RT2500 wireless NICs. +device ral # Ralink Technology RT2500 wireless NICs. #device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. ==== //depot/projects/vap/sys/modules/Makefile#28 (text+ko) ==== @@ -225,8 +225,8 @@ pseudofs \ ${_pst} \ puc \ - ${_XXX_ral} \ - ${_XXX_ralfw} \ + ral \ + ralfw \ ${_random} \ ${_ray} \ rc \ ==== //depot/projects/vap/sys/modules/ralfw/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= rt2561 rt2561s rt2661 rt2860 +SUBDIR= rt2561 rt2561s rt2661 .include <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805162157.m4GLv3ln083611>