From owner-freebsd-multimedia  Thu Jun  3  4:12: 2 1999
Delivered-To: freebsd-multimedia@freebsd.org
Received: from fleming.cs.strath.ac.uk (fleming.cs.strath.ac.uk [130.159.196.126])
	by hub.freebsd.org (Postfix) with ESMTP
	id 031B414C20; Thu,  3 Jun 1999 04:11:53 -0700 (PDT)
	(envelope-from roger@cs.strath.ac.uk)
Received: from cs.strath.ac.uk (scary.dmem.strath.ac.uk [130.159.202.5])
	by fleming.cs.strath.ac.uk (8.8.8/8.8.8) with ESMTP id MAA20919
	Thu, 3 Jun 1999 12:11:51 +0100 (BST)
Message-ID: <37566334.7A75EDC4@cs.strath.ac.uk>
Date: Thu, 03 Jun 1999 12:12:52 +0100
From: Roger Hardiman <roger@cs.strath.ac.uk>
Organization: Strathclyde University
X-Mailer: Mozilla 4.04 [en] (X11; I; FreeBSD 3.2-STABLE i386)
MIME-Version: 1.0
To: cvs-committers@FreeBSD.org, phk@FreeBSD.org, cvs-all@FreeBSD.org
Cc: multimedia@FreeBSD.org,
	Greg Pavelcak <gpavelcak@philos.umass.edu>
Subject: Bt848 driver broken in -current (was /dev/bktr0 failed)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-multimedia@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

Hi,

Poul's recent cdevsw changes to -current have broken the
bt848/bt878 bktr driver.

> phk         1999/05/30 09:53:50 PDT
> This commit should be a extensive NO-OP:
> Reformat and initialize correctly all "struct cdevsw".

Not quite a NO-OP, but the slip up was a subtle one and easy
to get wrong.

The new cdevsw code uses a new function call
which is added to the bktr_probe() function.
        cdevsw_add(&bktr_cdevsw); 


Unfortunatly it was added to the BSDI bktr_probe() code and
not the FreeBSD bktr_probe() code.

#ifdef __bsdi__
  .. blah blah blah
  .. bktr_probe()             <- cdev change went here
  .. blah blah blah
#endif
  
#ifdef __FreeBSD__
  .. blah blah blah
  .. bktr_probe()             <- it should be here
  .. blah blah blah
#endif


THE FIX...
Move the following 3 lines
    static int once;

    if (!once++)
        cdevsw_add(&bktr_cdevsw);  

from the _BSDI_ bktr_probe
to the _FreeBSD_ bktr_probe

and it should all work.


I'll try and do a commit this evening, when I can test it.

It is temping to rip out the BSDI code.
Althouth the NetBSD/OpenBSD people want me to add their patches to the
source.

Bye
Roger
--
Roger Hardiman
Strathclyde Uni Telepresence Research Group, Glasgow, Scotland.
http://telepresence.dmem.strath.ac.uk      0141 548 2897
roger@cs.strath.ac.uk


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-multimedia" in the body of the message