From owner-svn-src-user@FreeBSD.ORG Wed Dec 7 21:55:11 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9DEF01065670;
Wed, 7 Dec 2011 21:55:11 +0000 (UTC)
(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 820558FC1A;
Wed, 7 Dec 2011 21:55:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB7LtBd1057490;
Wed, 7 Dec 2011 21:55:11 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB7LtBZg057487;
Wed, 7 Dec 2011 21:55:11 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201112072155.pB7LtBZg057487@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 7 Dec 2011 21:55:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r228334 - user/sbruno/1394dev/firewire
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Dec 2011 21:55:11 -0000
Author: sbruno
Date: Wed Dec 7 21:55:11 2011
New Revision: 228334
URL: http://svn.freebsd.org/changeset/base/228334
Log:
Add JMicron JMB381 to the supported list, even though its the most broken.
I'd just like to know if that's the card I'm dealing with.
Modified:
user/sbruno/1394dev/firewire/fwohci_pci.c
user/sbruno/1394dev/firewire/fwohcireg.h
Modified: user/sbruno/1394dev/firewire/fwohci_pci.c
==============================================================================
--- user/sbruno/1394dev/firewire/fwohci_pci.c Wed Dec 7 21:54:44 2011 (r228333)
+++ user/sbruno/1394dev/firewire/fwohci_pci.c Wed Dec 7 21:55:11 2011 (r228334)
@@ -213,6 +213,10 @@ fwohci_pci_probe( device_t dev )
device_set_desc(dev, "Sun PCIO-2");
return BUS_PROBE_DEFAULT;
}
+ if (id == (FW_VENDORID_JMICRON | FW_DEVICE_JMB381)) {
+ device_set_desc(dev, "JMicron JMB381 1394a");
+ return BUS_PROBE_DEFAULT;
+ }
#endif
if (pci_get_class(dev) == PCIC_SERIALBUS
&& pci_get_subclass(dev) == PCIS_SERIALBUS_FW
Modified: user/sbruno/1394dev/firewire/fwohcireg.h
==============================================================================
--- user/sbruno/1394dev/firewire/fwohcireg.h Wed Dec 7 21:54:44 2011 (r228333)
+++ user/sbruno/1394dev/firewire/fwohcireg.h Wed Dec 7 21:55:11 2011 (r228334)
@@ -48,6 +48,7 @@
#define FW_VENDORID_INTEL 0x8086
#define FW_VENDORID_ADAPTEC 0x9004
#define FW_VENDORID_SUN 0x108e
+#define FW_VENDORID_JMICRON 0x197b
#define FW_DEVICE_CS4210 (0x000f << 16)
#define FW_DEVICE_UPD861 (0x0063 << 16)
@@ -78,6 +79,7 @@
#define FW_DEVICE_7007 (0x7007 << 16)
#define FW_DEVICE_82372FB (0x7605 << 16)
#define FW_DEVICE_PCIO2FW (0x1102 << 16)
+#define FW_DEVICE_JMB381 (0x2380 << 16)
#define PCI_INTERFACE_OHCI 0x10