From owner-freebsd-tokenring Sun Mar 19 2:26: 6 2000 Delivered-To: freebsd-tokenring@freebsd.org Received: from Draculina.otdel-1.org (Draculina.Otdel-1.ORG [195.230.65.30]) by hub.freebsd.org (Postfix) with ESMTP id B9E6D37B6AD; Sun, 19 Mar 2000 02:26:03 -0800 (PST) (envelope-from nms@otdel-1.org) Received: by Draculina.otdel-1.org (Postfix, from userid 1002) id 4FA5F178; Sun, 19 Mar 2000 13:26:01 +0300 (MSK) Date: Sun, 19 Mar 2000 13:26:01 +0300 From: Nikolai Saoukh To: lile@freebsd.org Cc: freebsd-tokenring@freebsd.org Subject: small typo in new-bus Olicom drover & bit of respect Message-ID: <20000319132600.A2368@Draculina.otdel-1.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i Sender: owner-freebsd-tokenring@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG There is small typo (I hope so) in work memory allocation Shall we respect Olicom and name OC-3540 as '... 100/16/4 ...'? --- if_oltr.c.orig Sun Mar 19 13:18:02 2000 +++ if_oltr.c Sun Mar 19 13:19:28 2000 @@ -110,5 +110,5 @@ /* 17 */ "Olicom PCMCIA 16/4 Adapter (OC-3121, OC-3230, OC-3232) [unsupported]", /* 18 */ "Olicom PCMCIA 16/4 Adapter (OC-3250)", - /* 19 */ "Olicom RapidFire 3540 4/16/100 Adapter (OC-3540)" + /* 19 */ "Olicom RapidFire 3540 100/16/4 Adapter (OC-3540)" }; @@ -400,5 +400,5 @@ if (work_size) { - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) { + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) { device_printf(dev, "failed to allocate work memory.\n"); } else { @@ -767,5 +767,5 @@ if (work_size) - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) printf("oltr%d: failed to allocate work memory.\n", unit); else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-tokenring" in the body of the message From owner-freebsd-tokenring Sun Mar 19 6:31: 0 2000 Delivered-To: freebsd-tokenring@freebsd.org Received: from heathers.stdio.com (heathers.stdio.com [199.89.192.5]) by hub.freebsd.org (Postfix) with ESMTP id 25DC637B635; Sun, 19 Mar 2000 06:30:52 -0800 (PST) (envelope-from lile@stdio.com) Received: from heathers (heathers [199.89.192.5]) by heathers.stdio.com (8.9.3/8.8.8) with ESMTP id JAA81640; Sun, 19 Mar 2000 09:30:40 -0500 (EST) (envelope-from lile@stdio.com) Date: Sun, 19 Mar 2000 09:30:39 -0500 (EST) From: Larry Lile To: Nikolai Saoukh Cc: lile@FreeBSD.ORG, freebsd-tokenring@FreeBSD.ORG Subject: Re: small typo in new-bus Olicom drover & bit of respect In-Reply-To: <20000319132600.A2368@Draculina.otdel-1.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-tokenring@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, 19 Mar 2000, Nikolai Saoukh wrote: > There is small typo (I hope so) in work memory allocation > Shall we respect Olicom and name OC-3540 as '... 100/16/4 ...'? > > --- if_oltr.c.orig Sun Mar 19 13:18:02 2000 > +++ if_oltr.c Sun Mar 19 13:19:28 2000 > @@ -110,5 +110,5 @@ > /* 17 */ "Olicom PCMCIA 16/4 Adapter (OC-3121, OC-3230, OC-3232) [unsupported]", > /* 18 */ "Olicom PCMCIA 16/4 Adapter (OC-3250)", > - /* 19 */ "Olicom RapidFire 3540 4/16/100 Adapter (OC-3540)" > + /* 19 */ "Olicom RapidFire 3540 100/16/4 Adapter (OC-3540)" > }; > @@ -400,5 +400,5 @@ > > if (work_size) { > - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) { > + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) { > device_printf(dev, "failed to allocate work memory.\n"); > } else { > @@ -767,5 +767,5 @@ > > if (work_size) > - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) > + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) > printf("oltr%d: failed to allocate work memory.\n", unit); > else Good catch Nikolai, I will get that fixed. I am still working on rolling in your patches, make sure I don't lose anything. -- Larry To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-tokenring" in the body of the message From owner-freebsd-tokenring Sun Mar 19 13:51:28 2000 Delivered-To: freebsd-tokenring@freebsd.org Received: from heathers.stdio.com (heathers.stdio.com [199.89.192.5]) by hub.freebsd.org (Postfix) with ESMTP id 7448137B790 for ; Sun, 19 Mar 2000 13:51:26 -0800 (PST) (envelope-from lile@stdio.com) Received: from heathers (heathers [199.89.192.5]) by heathers.stdio.com (8.9.3/8.8.8) with ESMTP id QAA97598 for ; Sun, 19 Mar 2000 16:51:25 -0500 (EST) (envelope-from lile@stdio.com) Date: Sun, 19 Mar 2000 16:51:25 -0500 (EST) From: Larry Lile To: tokenring@freebsd.org Subject: Long awaited token-ring updates... Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-tokenring@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I have moved the "ol" driver into the cvs tree, it will now be known as "oltr". This has the unfortunate side effect of removing support for ISA cards. I will be adding support back for them when I have time. I am also working on getting ifmedia to work correctly in the driver. It is availble in RELENG_3, RELENG_4 and -current. Also there have been several updates to the generic token-ring code that may solve some of the "off-air" without a ping problems. Not to mention a large amount of general cleanup. These updates are available in the -current branch. If I get no bad reports about them I will move them into -stable shortly. There is still an issue with ARP & source routing that has not been resolved, but I am working on it. Please let me know if you experience any problems with the new driver. Thanks to Matthew Dodd, Nikolai Saoukh, Larry Baird and others whose names escape me for helping debug and providing patches for the new driver. Thanks to everyone else for their patience, I know I have been kinda slow. -- Larry Lile lile@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-tokenring" in the body of the message From owner-freebsd-tokenring Tue Mar 21 19:59:56 2000 Delivered-To: freebsd-tokenring@freebsd.org Received: from heathers.stdio.com (heathers.stdio.com [199.89.192.5]) by hub.freebsd.org (Postfix) with ESMTP id 462AB37BB10 for ; Tue, 21 Mar 2000 19:59:50 -0800 (PST) (envelope-from lile@stdio.com) Received: from heathers (heathers [199.89.192.5]) by heathers.stdio.com (8.9.3/8.8.8) with ESMTP id WAA52062 for ; Tue, 21 Mar 2000 22:59:49 -0500 (EST) (envelope-from lile@stdio.com) Date: Tue, 21 Mar 2000 22:59:49 -0500 (EST) From: Larry Lile To: tokenring@freebsd.org Subject: Okay, I'm not a writer, but ... Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-tokenring@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Work continues on the oltr driver, but I needed a diversion for a little while. Here is a first pass of a man page for the oltr driver. Anybody have suggestions, improvments or questions about it? Larry lile@stdio.com .\" Copyright (c) 2000 .\" Larry Lile . All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the author nor the names of any co-contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\" .Dd March 22, 2000 .Dt OLTR 4 .Os FreeBSD .Sh NAME .Nm oltr .Nd Olicom token-ring adapter device driver .Sh SYNOPSIS .Cd "device oltr0" .Sh DESCRIPTION The .Nm driver provides support for PCI token-ring adapters. This includes the OC-3136, OC-3137, OC-3140, OC-3140 and OC-3540. .Pp The .Nm driver supports the following media types: .Pp .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It autoselect Enable autoselection of the media type and options. Note that this option is only available with the OC-3139, OC-3140, OC-3141 and OC-3540. For all other adapters, the driver will default to 16Mbps. The user can change this by adding media options to the .Pa /etc/rc.conf file. .It UTP/100Mbps Set 100Mbps operation. Note that this options is only avaiable with the OC-3540. .It UTP/16Mbps Set 16Mbps operation. .It UTP/4Mpbs Set 4Mpbs operation. .El .Pp NOTE: The adapter card will automatically switch between media connectors, there is no need to specify DB9, STP, UTP or fiber. .Pp The .Nm driver does not support media options at this time. .Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh DIAGNOSTICS .Bl -diag .It "oltr%d: %s" The driver is very noisy, and produces many strange diagnostic messages. .El .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , .Xr ifconfig 8 , .Sh BUGS Lots of them i'm sure, please report them to .An Larry Lile .Aq lile@stdio.com . .Pp Media type selection is currently broken. .Pp ISA cards are no longer supported by the driver. They will be restored when time permits. .Sh HISTORY The .Nm device driver first appeared in .Fx 3.3 . .Sh AUTHORS The .Nm driver was written by .An Larry Lile Aq lile@stdio.com . To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-tokenring" in the body of the message