Commit Graph

79 Commits

Author SHA1 Message Date
Duncan Barclay
a6a0d91dba pkh's TAILQ changes to if_mutliaddrs missed a counting loop. 2001-03-04 20:56:45 +00:00
Poul-Henning Kamp
6817526d14 Convert if_multiaddrs from LIST to TAILQ so that it can be traversed
backwards in the three drivers which want to do that.

Reviewed by:    mikeh
2001-02-06 10:12:15 +00:00
Poul-Henning Kamp
37d4006626 Another round of the <sys/queue.h> FOREACH transmogriffer.
Created with:   sed(1)
Reviewed by:    md5(1)
2001-02-04 16:08:18 +00:00
Poul-Henning Kamp
78d82c8c59 Use LIST_FOREACH() to traverse ifp->if_multiaddrs list, instead of
<sys/queue.h> implementation details.

Created with:   /usr/sbin/sed
Reviewed with:  /sbin/md5
2001-02-03 16:29:10 +00:00
Duncan Barclay
a07736d0f6 Take advantage of the fixes to the pcic code that allows multiple
active memory maps. This removes the need to change the memory
map from common to attribute every time a packet is sent/received.

This increases performance and decreases cpu load (ping times on
slow machines improve by about 1.5ms).

Move out the old common memory/attrbiute memory hack functions to a
new header file to tidy up the main code. I want to keep them available
for a while.
2001-01-17 17:55:00 +00:00
Warner Losh
486d464d74 o Now that I've had time to test the new interface, reintegrate it back in.
o Fix OLDCARD to use the new interface.
o Rename the offsetp argument to deltap to more closely reflect what it
  is returning (it returns the delta from the requested value to the actual
  value).
o Remove duplicate $FreeBSD$ in pccbb.c
o Allow deltap to be NULL.
o Convert new isa pcic driver and add XXX comments that this function isn't
  actually implemented there (which means that NEWCARD pccard stuff won't
  work there until it is).
o Revert attempts to make old inferface work in NEWCARD.

Subitted by: peter (Parts of the new version code)
2001-01-07 16:31:09 +00:00
Duncan Barclay
2ae2c42c38 Tidy up if_init routine so that it does not return an error. 2001-01-02 20:29:25 +00:00
Bill Paul
b1f3daafde Fix probe/attach a little. We don't have to call bpfattach() anymore
since ether_ifattach() does it for us. We do need to call ether_ifdetach()
instead of if_detach(). And we don't have to check for ifp->if_name
already being initialized because it never will be in FreeBSD 4.x and
above.

Reviewed by:	Warner Losh, Duncan Barclay
2000-12-08 21:35:11 +00:00
Warner Losh
3e8e7863b2 Changes necessary to make this work.
The prior version in the tree was repo-copied from Duncan Barclay's
cvs tree.

Also add $FreeBSD$

Submitted by: Duncan Barclay
Committed-via: raylan link with two webgear cards.
2000-11-12 21:43:52 +00:00
Duncan Barclay
6b55e51be0 Add attribute memory setup warnings 2000-07-11 21:31:59 +00:00
Duncan Barclay
766748ceac Move newbus detection code to alloc routines.
Work around pccard nasties.
2000-07-07 19:13:11 +00:00
Duncan Barclay
cbe16a893d Subtle Tx bugs - I wonder why the cast wans't picked up... 2000-06-21 21:37:27 +00:00
Duncan Barclay
a8cef3390b Minor tweaks to error messages (after writing man page).
Renamed varible dst in ray_rx to mp as it is a pointer to an mbuf.

Correctly grok addresses in data packets.

Promte a couple of RECERRs to real errors.
2000-06-20 20:14:29 +00:00
Duncan Barclay
ce5163041d Remove RECERR from RAY_DEBUG 2000-06-18 21:41:24 +00:00
Duncan Barclay
0218cb013b General tidy up and plough through TODO list.
Rewrote intro at top of file to reflect my better understanding of how it
the memory mapping works.

Clear the DONE list and move some thoughts into the TODO list.

Remove RECERR from RAY_DEBUG

Start to use a desired network parameter structure, only used in download
code as I've realised that there are some problems with the idea.

Break up ray_rx, and move the data packet handler into a seperate function. This meant some knock on changes in ray_rx_mgt/ray_rx_ctl to do with
mbuf freeing.

Remove some debug code/XXX comments that are out of date.
2000-06-18 21:40:46 +00:00
Duncan Barclay
b248ba3a75 Add a desired network parameter structure to runq entries. 2000-06-18 21:10:58 +00:00
Duncan Barclay
da5777391d Suck out all of the current and desired n/w parameters. 2000-06-11 13:57:59 +00:00
Duncan Barclay
dab93c89dd Generated a new macor, RAY_RECERR for reporting errors with. Verbosity set with IFF_DEBUG (recommended at present).
Move promisc flag into the nw parameter structure.
2000-06-11 13:56:11 +00:00
Duncan Barclay
9a970e19aa Generated a new macor, RAY_RECERR for reporting errors with. Verbosity set with IFF_DEBUG (recommended at present). 2000-06-11 13:54:59 +00:00
Duncan Barclay
46281163a8 A bunch of misc. tidy ups really.
Generated a new macor, RAY_RECERR for reporting errors with. Verbosity set with IFF_DEBUG (recommended at present).

Add PRIBIO to tsleeps.

Catch detach on ray_ccs_alloc a little better.

Move sc_promisc into desired and current n/w parameters.

Remove IFQ_PEEK, we know the driver runs okay without it.

Drain the output queue in ray_stop.

Only use ray_mcast for ADD/DEL multi ioctls. ray_init_multi resets the
multicast list on startup. Simplifies ray_init a little.

Tidy some old comments.

ray_download_done now copies the whole desired n/w parameter set into the
current set. This is because I was missing soem parameters - like the
net type!
2000-06-11 13:32:07 +00:00
Duncan Barclay
5f95c244f0 Removed a few RAY_MAP_CMs that were not needed.
Made checking sc->gone a lot safer by checking to see if sc is NULL first.

Made return from tsleep in the ccs allocator detach safe.
2000-06-10 21:24:36 +00:00
Duncan Barclay
47dbe852ba Seperate debug for dumping comq entries. 2000-06-10 13:52:27 +00:00
Duncan Barclay
332e85b29d Add macros for freeing a set of malloc runq entries and adding them to the
runq queue, safely checking for ENXIO
2000-06-10 13:52:06 +00:00
Duncan Barclay
8204ff6102 Remove promisc_user, ray_reset and ray_reset_timo as they are not used. Incidental remove of a timer too. Remove the runq_abort code.
Get ray_detach working correctly. This is a very simple routine as it
just wakes up sleeping processes. Note that anything woken has NO softc
structure available! runq_add is suitably modified to detect a detach and
return straight away.

Due to ray_detach and its implications use a macro for adding things
to the runq in user land.
2000-06-10 13:50:57 +00:00
Duncan Barclay
5c0bff264f Cosmetic and capture a register dump _before_ I've downloaded values to
the card.
2000-06-04 21:14:57 +00:00
Duncan Barclay
77d868ca7a As part of the IFF_RUNNING stuff, we've added an extra flag so callers
can request that runq routines should check IFF_RUNNING before executing.
2000-06-04 21:14:26 +00:00
Duncan Barclay
8544bea23f Main changes are resurection of mutlicast code (jgibbs moved the stuff I
needed to add into ether_input) and finally sorting IFF_RUNNING through
whole driver.

As part of the IFF_RUNNING stuff, we've added an extra flag so callers
can request that runq routines should check IFF_RUNNING before executing.

Remove BPF taps as this is now done by ether_input.

Resurrect multicast code, moving the multicast list stuff to the runq
routine.

Dump ray_promisc_user as all flag changes are now handled by ray_init, and
add a couple of checks to ray_promisc.

In uppparams_user, allow changes before the card is running (need to
fix some breakage with _download here later). In addition, don't
assume that the current n/w parameters are valid - they are only valid
in the runq.

Fix a nasty flag bug - runq_add cleared all the flags on the last command!

Remove the hacks for setting the memory flags - problems were down
to buggy versions of pccardd. For some reason pccardd only dtrt with
the "right" debug_level.
2000-06-04 17:51:36 +00:00
Duncan Barclay
66d7d8c631 Remove unused ioctl locking 2000-05-28 23:23:24 +00:00
Duncan Barclay
203e551839 Made RAY_COM_DUMP a real debug called RAY_DCOM
unsed ioctl locking
2000-05-28 23:11:47 +00:00
Duncan Barclay
9385b6d6d7 A bit of a messy monster.
Simple stuff
------------

	Split _download up so that the MIB settings are in their own functions.

	Made "tx completed but status is ..." a recoverable error

	Cut down verbosity of "unloaded" messages

	Moved ccs_free and com_runq from intr_ccs to ecf_done and runq_done
	to avoid embarasing mistakes and waits.

	Merged runq_add and runq_arr into one and called it runq_add

	Made RAY_COM_DUMP a real debug called RAY_DCOM

	Consistnet debugging around tsleeps.

	Use bus_activate_resource for attr/cm mapping, and set the flags
	correctly in the allocation routines (needs more hacks to
	sys/pccard/pcic.c)

	com_malloc is now seperated from the comq initialization. This was
	done whilst trying to set automatic variables for the comqs.

Harder Stuff
------------

	As part of the IFF_RUNNING fixes, remove the panic in runq if we are
	not running.

	Change, again, runq_add. This time we don't do any cleaning up
	if there were errors. This is so that callers get the chance
	to re-try (not that I ever see it being used).

	In runq_add, only sleep when there is something to sleep on!

	ioctl locking routines, stolen from awi.c but not used


Hardest Stuff
-------------

	Dealing with serialing ioctls correctly means that we must QUEUE
	changes to IFF_RUNNING and check it in the QUEUED commands, not
	in the user commands. Whilst simple to state, it took a few
	hours of head scratching to get it right. The realisation was that
	I only have to guarantee that sub-commands from a single process
	are serialised and "atomic", and that they check the status of the
	interface flags when invoked and not when they are queued.

	Another way of looking at it, is that the driver's state is stored
	in the runq and the IFF_RUNNING flag. These must be changed together.

	What this means practically, is that IFF_RUNNING is set after
	we have started/joined/associated with a network. And it is
	cleared by ray_stop via the runq so that unfinsished commands are
	not distrupted.

	I still have to fix up promisc, upp/repparams and mcast.

	Oh yeah, stop is essentially a noop in that it only
	changes IFF_RUNNING
2000-05-28 23:10:12 +00:00
Duncan Barclay
1a733adb0e Moved a bit of resource allocation from probe to attach based on feedback
in -hackers on the correct driver structure.

Started to tidy up _detach and _stop.

Added the comq array stuff into mcast.
2000-05-23 16:38:12 +00:00
Duncan Barclay
ca08af854e MFRELENG_3 2000-05-21 21:20:18 +00:00
Duncan Barclay
6805bd1b92 MFRELENG_3 2000-05-21 20:51:09 +00:00
Duncan Barclay
6bb2042b66 MFRELENG_3 2000-05-21 20:43:24 +00:00
Duncan Barclay
753c209eb7 Newbusify resource allocation.
Have OLDCARD version of the remapping.

Remove BPF conditionals.

Remove ISA/3.x stuff and add -current stuff.
2000-05-11 18:55:38 +00:00
Duncan Barclay
fa1b5c0246 Remove ISA/3.x stuff and add -current stuff
Use device_printf.
2000-05-11 18:53:50 +00:00
Duncan Barclay
144f532f95 Use device_printf. 2000-05-11 18:53:10 +00:00
Duncan Barclay
9fad5d9072 Move a couple fo things around to be nicer for -current
Move to using /sys/dev/ray for driver

Backport -current ray_res code - most are stubs.

Make ray_attr stuff look like currents layout.

Make attribute memory access use a macro and ripple through.

Drop FIXUP as we always need it
2000-05-10 21:19:38 +00:00
Duncan Barclay
a10fc605e1 Move a couple fo things around to be nicer for -current
A few more () in macros

Make attribute memory access use a macro and ripple through.

Drop FIXUP as we always need it
2000-05-10 21:18:01 +00:00
Duncan Barclay
2c3bbebe5a Add a STOP debug flag.
Fix DHEX8 to use SRAM_READ_1

Tweak printing statements to generate less diffs with -current version.

Adda a few () around macro variables.
2000-05-10 21:15:43 +00:00
Duncan Barclay
88577b0806 Move _detach to be underneath _attach.
Move the code that checks the card into _probe and out of _attach and
shuffle a couple of things around in attach.

Set ifp in the variable block - catches unused variables.
2000-05-07 16:03:36 +00:00
Duncan Barclay
b986ec50b9 Move variables to if_rayvar.h 2000-05-07 15:15:06 +00:00
Duncan Barclay
48913351d1 Split out structures to make it a bit easier to find my way around and
be more like sys/dev coding.
2000-05-07 15:12:18 +00:00
Duncan Barclay
9eb774e39c Sync with an early version of the -current code. Mainly a tidy up
of some function names, dropping the ISA bits that were never used and
removing __P

We've renamed the _pccard_ stuff as nothing else probes or attaches.

In the next commit we will move some routines around and split out some of the
structure definitions to another file.

I've dropped the SYSCTL as I never got it working. APM is gone too as it
is broken.

Note, that the attr_read/write will be in both this and NEWCARD/NEWBUS so
I've moved the prototypes to the right place.
Add a few casts.
2000-05-07 15:00:06 +00:00
Duncan Barclay
049629c406 Cosmetic to make errors messages look similar. 2000-04-24 15:49:20 +00:00
Duncan Barclay
d4f3c0d870 Moved debugging definitions to a header file.
Removed NETBSDTX spares.

Renamed a load of functions - specifcally
	start -> tx
	init has download, sj and assoc as sub-functions
	report_params and update params move to repparams/upparams

Tidied up old #define's

Got rid of old DPRINTF, made printf's RAY_PRINTF and panic's RAY_PANIC

All code KNF

Removed checking the ECF_TO_HOST area in ray_init - this gets hosed
when someone updates/read a parameter from the card so causes
unneeded grief. This required moving the tib check into ray_attach.

Changed handling of interface flags in ioctl so that promiscous mode
changes are only done as needed.

Sequences of comq entries can be added to an array and automatically
dealt with - used in ray_init_user and others.

Moved IFF_RUNNING checks from the comq commands to com_runq - still
not sure what to do so we PANIC - will be fixed.

ray_sj now checks to see if any of the parameters it can update can be
updated.

ray_sj_done now updates parameters to the current n/w set if we changed
them earlier. I was being a bit thick in earlier comments as to why this
check was done - the ECF never changes the parameters.

Assocication with APs is handled outside of ray_sj - need to add
WEP stuff if I ever get my hands on an AP.

ray_stop, ray_unload and ray_reset are currently broken - reset isn't used anyway.

ray_tx_XXX and ray_rx only have cosmetic changes.

Interrupt handler now gets command out of ccs. This is so ray_intr_ccs and
ray_intr_rcs don't need to remap CM (I'm trying to roll things up a bit as
it must be slowing us down).

ray_intr_ccs just vectors commands to functions or error checks - a
jump table could replace it in ray_intr.

Ditto for ray_intr_rcs.

mcast is currently broken - I need to do more work for ALLMULTI etc. This is reasonably easy to fix becuase of the comq array stuff.

Added a few more checks into repparams so that it is firmware version aware. It also uses the new comq framework.

Parameter updating is also much better with the update parameter return routine re-worked.

Added a couple of runq entry helper functions - one that malloc's a new
entry and fills it in with sensible defaults and another that adds and
runs a seqencue of entries.
2000-04-24 15:19:40 +00:00
Duncan Barclay
307c64c7d4 Bit mask definitions for firmware versioning.
Added versioning info to the MIB sizes array so that both raycontrol
and if_ray have a better chance of not sending duff data to the ECF.
2000-04-24 14:51:25 +00:00
Duncan Barclay
e1a7927f55 Initial import. 2000-04-24 14:50:01 +00:00
Duncan Barclay
276c01a834 Make the moved about version compile and run 2000-04-24 10:10:01 +00:00
Duncan Barclay
66682a7f1e Moved functions around so that they are grouped a little more sensibly. 2000-04-22 14:22:51 +00:00