From owner-freebsd-current  Wed Mar 12 00:20:39 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id AAA24934
          for current-outgoing; Wed, 12 Mar 1997 00:20:39 -0800 (PST)
Received: from helbig.informatik.ba-stuttgart.de (helbig.informatik.ba-stuttgart.de [141.31.166.22])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id AAA24929
          for <current@FreeBSD.org>; Wed, 12 Mar 1997 00:20:34 -0800 (PST)
Received: (from helbig@localhost)
	by helbig.informatik.ba-stuttgart.de (8.8.5/8.8.5) id JAA14656;
	Wed, 12 Mar 1997 09:20:00 +0100 (MET)
From: Wolfgang Helbig <helbig@MX.BA-Stuttgart.De>
Message-Id: <199703120820.JAA14656@helbig.informatik.ba-stuttgart.de>
Subject: Re: cvs commit:  src/sys/i386/isa wdc_p.h wd.c src/sys/conf files src/sys/pci wdc_p.c
In-Reply-To: <19970312004914.VS14732@uriah.heep.sax.de> from J Wunsch at "Mar 12, 97 00:49:14 am"
To: joerg_wunsch@uriah.heep.sax.de
Date: Wed, 12 Mar 1997 09:19:58 +0100 (MET)
Cc: current@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL30 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-current@FreeBSD.org
X-Loop: FreeBSD.org
Precedence: bulk

Hi J"org,

> As Stefan Esser wrote:
> 
> >   Branch:      sys/conf  RELENG_2_2
> >   Modified:    sys/i386/isa  wd.c
> >                sys/conf  files
> >   Added:       sys/i386/isa  wdc_p.h
> >                sys/pci   wdc_p.c
> 
> I think you've accidentally mixed the branches here.  The change to
> sys/conf/files went (only) into RELENG_2_2, while the remaining
> happened in HEAD.
> 
> >   Revision  Changes    Path
> >   1.126     +120 -1    src/sys/i386/isa/wd.c
> >   1.80.2.6  +1 -0      src/sys/conf/files
>     ^^^^^^^^
> 
> Do you have an idea how stable this is, and whether it's dangerous for
> non-CMD640 users?  If not, i wouldn't mind pulling it into 2.2.
> 
> -- 
> cheers, J"org
> 

Oh, if I would have seen a slightest chance of this patch going into
RELENG_2_2, I would have worked with 2.2 instead of watching Lite2 merging
with -current. So it's only been tested with -current (pre and post Lite2).

And even for -current there are some test cases are missing:

o  options "CMD640" and no CMD640b-chip in the system.

o  no options "CMD640" with and without CMD640b-chip.
 
It *should* work though.

To test in -current, you'll have to patch /sys/conf/files, since this change
was accidently committed to RELENG_2_2.

*** files.orig	Tue Mar 11 23:30:28 1997
--- files	Tue Mar 11 23:33:28 1997
***************
*** 332,337 ****
--- 332,338 ----
  pci/if_ed_p.c		optional ed device-driver
  pci/if_fxp.c		optional fxp device-driver
  pci/if_lnc_p.c		optional lnc device-driver
+ pci/wdc_p.c		optional wdc device-driver
  dev/pdq/pdq.c		optional fea device-driver
  dev/pdq/pdq_ifsubr.c	optional fea device-driver
  pci/if_fpa.c		optional fpa device-driver

TIA

Wolfgang