Date: Fri, 27 Nov 1998 00:05:41 +0000 From: Nicolas Souchu <nsouch@teaser.fr> To: aw1@stade.co.uk Cc: current@FreeBSD.ORG, freebsd-multimedia@FreeBSD.ORG Subject: Re: kernel make failure in smbus Message-ID: <19981127000541.21781@breizh.prism.uvsq.fr> In-Reply-To: <19981124025011.A832@stade.co.uk>; from Adrian Wontroba on Tue, Nov 24, 1998 at 02:50:11AM %2B0000 References: <199811222006.MAA00385@rah.star-gate.com> <199811222106.XAA00350@greenpeace.grondar.za> <19981124025011.A832@stade.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Nov 24, 1998 at 02:50:11AM +0000, Adrian Wontroba wrote:
>
>On Sun, Nov 22, 1998 at 11:06:46PM +0200, Mark Murray wrote:
>> My card is not a Miro, and it is not NTSC. I believe this is unrelated
>> to Doug's patches, which should go in. Shall I do the honours?
>
>Card detection has been iffy since the bktr driver was changed to use the
>iic/smbus stuff - setting the hw.bt848.(card|tuner|reverse_mute) oids on
>startup is the easy way of dealing with it.
I thought it was solved when we returned to the previous
check_for_i2c_devices() behaviour. What about trying the following patch
which disables iic/smb support?
Index: brooktree848.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/brooktree848.c,v
retrieving revision 1.59
diff -u -r1.59 brooktree848.c
--- brooktree848.c 1998/11/08 12:39:06 1.59
+++ brooktree848.c 1998/11/27 00:00:47
@@ -355,11 +355,15 @@
#include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */
#include <sys/bus.h>
#include <pci/brktree_reg.h>
+
+#ifdef IIC_SUPPORT
#include <pci/bt848_i2c.h>
#include <dev/smbus/smbconf.h>
#include <dev/iicbus/iiconf.h>
#include "smbus_if.h"
#include "iicbus_if.h"
+#endif /* IIC_SUPPORT */
+
#include <sys/sysctl.h>
static int bt848_card = -1;
static int bt848_tuner = -1;
@@ -1178,9 +1182,11 @@
fun = pci_conf_read(tag, 0x40);
pci_conf_write(tag, 0x40, fun | 1);
+#ifdef IIC_SUPPORT
/* XXX call bt848_i2c dependent attach() routine */
if (bt848_i2c_attach(unit, bktr->base, &bktr->i2c_sc))
printf("bktr%d: i2c_attach: can't attach\n", unit);
+#endif
#ifdef BROOKTREE_IRQ /* from the configuration file */
old_irq = pci_conf_read(tag, PCI_INTERRUPT_REG);
@@ -4169,7 +4175,7 @@
BT848_DATA_CTL_I2CSCL | \
BT848_DATA_CTL_I2CSDA)
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && defined(IIC_SUPPORT)
/*
* The hardware interface is actually SMB commands
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19981127000541.21781>