hal/fdi/20freedesktop lucent-pcmcia-wireless.fdi, NONE, 1.1 Makefile.am, 1.2, 1.3

Joe Shaw joe at pdx.freedesktop.org
Mon Jun 7 12:54:16 PDT 2004


Update of /cvs/hal/hal/fdi/20freedesktop
In directory pdx:/tmp/cvs-serv15297/fdi/20freedesktop

Modified Files:
	Makefile.am 
Added Files:
	lucent-pcmcia-wireless.fdi 
Log Message:
2004-06-07  Joe Shaw  <joeshaw at novell.com>

	* doc/TODO: Add an item about capability matching in FDI files.

	* fdi/20freedesktop/Makefile.am: Add lucent-pcmcia-wireless.fdi

	* fdi/20freedesktop/lucent-pcmcia-wireless.fdi: Added.  Matches
	Lucent WaveLAN cards and sets info.bus to pcmcia and a sane vendor
	and product.

	* tools/device-manager/Const.py.in: Add PCMCIA as a bus type.

--- NEW FILE: lucent-pcmcia-wireless.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>
    <match key="info.bus" string="unknown">
      <!-- FIXME: We need to be able to match capabilities -->
      <match key="info.capabilities" string="net net.ethernet net.ethernet.80211">
        <match key="net.ethernet.mac_addr_upper24" int="0x601d">
          <merge key="info.bus" type="string">pcmcia</merge>
          <merge key="info.vendor" type="string">Lucent Technologies"</merge>
          <merge key="info.product" type="string">WaveLAN/IEEE</merge>
        </match>
      </match>
    </match>
  </device>
</deviceinfo>

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	12 Apr 2004 16:45:03 -0000	1.2
+++ b/Makefile.am	7 Jun 2004 19:54:12 -0000	1.3
@@ -2,8 +2,9 @@
 
 fdi20freedesktopdir = $(datadir)/hal/fdi/20freedesktop
 
-dist_fdi20freedesktop_DATA = canon-digital-ixus-v.fdi \
-                             6in1-card-reader.fdi     \
-                             lexar-media-cf-reader.fdi
-
+dist_fdi20freedesktop_DATA = 		\
+	canon-digital-ixus-v.fdi	\
+	6in1-card-reader.fdi		\
+	lexar-media-cf-reader.fdi	\
+	lucent-pcmcia-wireless.fdi
 





More information about the hal-commit mailing list