pk
90b5c246c6
Skeleton code for the SBus expander box.
1998-04-18 19:00:17 +00:00
drochner
fb43bb5f19
Add danish keymap.
...
From Soren S. Jorvang (PR kern/5312).
1998-04-18 10:57:13 +00:00
drochner
13c6d27696
Fix spelling of my name.
...
Being here, remove BROKEN_INDIRECT_CONFIG.
1998-04-18 10:35:48 +00:00
drochner
d58832579d
Fix botched DMA tag initialization.
1998-04-18 10:26:56 +00:00
drochner
302692bf8d
Namespace protection: give key description table a more private name.
1998-04-18 09:51:20 +00:00
drochner
1745de275b
-Set keyboard (and/or controller) to XT scancode in early console
...
initialzation. Closes PR port-alpha/5303 (Jason Thorpe).
-Namespace protection: give key description table a more private name.
-Make sure "struct pckbd_internal" is completely initialized.
-Improve locator comparition in probe().
-Remove BROKEN_INDIRECT_CONFIG.
1998-04-18 09:49:58 +00:00
drochner
a099e8dda5
Initialize the command byte and its shadow register in early console
...
setup so that the keykoard driver can deal with scancode translation
in its console initialization function.
1998-04-18 09:42:20 +00:00
drochner
928943b2ff
Keep all relevant state information in a "pci_softc" so that it is
...
accessible at runtime (for LKMs in particular).
Remove BROKEN_INDIRECT_CONFIG.
1998-04-17 18:40:31 +00:00
thorpej
085787ddbe
defopt the WSEMUL options.
1998-04-17 00:17:27 +00:00
drochner
d3067d3f3f
-don't modify call arguments in place - bad for debugging
...
-give at least the i386 its keyboard beep back
1998-04-16 21:18:46 +00:00
drochner
d860c80512
regen
1998-04-16 19:48:14 +00:00
drochner
bfd53bac43
add 2 ATM chips, correct entry for Toshiba MIPS bridge
1998-04-16 19:46:03 +00:00
drochner
30654f3e89
Split out from if_le_isa.c - this card is quite different.
...
The driver is known not to work (timeout on send attempts).
1998-04-16 18:00:14 +00:00
drochner
02157092d4
Make the ISA LANCE drivers work without BROKEN_INDIRECT_CONFIG.
...
DEPCA is now split out into a separate driver.
Because there can be only one attachment of a device to a bus, for
each card type a separate pseudo-bus was introduced which attaches to "isa"
and where "le" attaches to.
1998-04-16 17:51:46 +00:00
drochner
10860a27c6
Don't use KS_GROUP_xxx values which have set something in the lower
...
8 bits. This allows to OR them with keycodes.
This is probably a workaround for namespace confusion happening else-
where (in wskbdutil.c:ksym_upcase() perhaps?), but it helps without
too much digging into the details.
1998-04-16 13:29:41 +00:00
drochner
3cc1fe831c
count allocated screens correctly
1998-04-16 12:52:42 +00:00
leo
112b5de402
Use a stream method for AHC_OUTSL when possible.
1998-04-16 07:13:57 +00:00
leo
d3febbb5aa
Do endian swaps where appropriate. This is currently dependent on 'BYTE_ORDER'
...
since the driver only supports little endian busses.
1998-04-16 07:12:43 +00:00
leo
b66dd55f59
Backout endian changes here (per discussion with Justin) and move them to
...
aic7xxx.c
1998-04-16 07:07:37 +00:00
drochner
ca0d504418
some attributes are now global
1998-04-15 20:29:16 +00:00
drochner
0c199c88be
add MI ISA VGA and the speaker driver
1998-04-15 20:26:53 +00:00
drochner
2c823077d7
MI driver for the ISA speaker, and the IBM BASIC playstring interpreter
...
which has so many fans.
1998-04-15 20:26:18 +00:00
drochner
aadda67e18
add mi PCI VGA and TGA
1998-04-15 20:17:17 +00:00
drochner
eda73f204f
The "mi" TGA driver. It's still not of much use on anything but alpha
...
because it depends on initialization by the firmware.
Further, an mi mmap() is needed...
1998-04-15 20:16:30 +00:00
mjacob
ac2ca72a01
a tab crept in
1998-04-15 16:52:37 +00:00
thorpej
6ea0ab26e2
Don't reference functions defined in isadma.c if we don't have to,
...
since we might not have any ISA DMA-using devices configured, thus
isadma.c won't be compiled. Fixes a problem reported by Kevin Lahey.
Also, since there are only 8 DMA channels, don't bother checking
DRQs 8 - 15.
1998-04-15 01:53:47 +00:00
thorpej
334ef5a59c
Fixup RCS IDs.
1998-04-15 01:45:43 +00:00
thorpej
8c1b46c2f5
Remove the `delay port' stuff since nothing uses it anymore (can't reliably
...
use it on modern chipsets).
1998-04-15 01:44:23 +00:00
thorpej
a95c0ac15a
Add pci_conf_print(), a function to dump the PCI configuration space, useful
...
in driver debugging. From Zubin D. Dittia <zubin@clouseau.arl.wustl.edu>,
PR #4249 .
1998-04-14 21:24:50 +00:00
thorpej
ce28bee247
Add UDF and 66MHz capable bit definitions for the PCI status register.
...
From Zubin D. Dittia <zubin@clouseau.arl.wustl.edu>, PR #4249 .
1998-04-14 21:22:44 +00:00
thorpej
ddf189f7da
Remove the stuff that was apparently not intended for commit in the
...
previous change.
1998-04-13 22:18:03 +00:00
augustss
993dcaa947
Add another device, YMH0021. From nathanw@MIT.EDU, PR #5289 .
1998-04-13 13:19:40 +00:00
ragge
4bcd8130fe
t_wopen fixes.
1998-04-13 12:14:42 +00:00
mjacob
76970a00f5
trim ID of ST19171FC so that SUN drives are caught
1998-04-10 17:13:11 +00:00
thorpej
db453b872d
Add support for the VIA Technologies VT86C926, from Kazuki Sakamoto,
...
PR #5256 .
1998-04-10 01:28:59 +00:00
hannken
30244f4eb7
Forgot to initialize sc->ioctl. From Matthias Drochner.
1998-04-09 17:16:57 +00:00
hannken
311e30018d
Split wscons/wskbd.c's softc into a static and a nonstatic part.
...
Booting into debugger (-d) now works.
Cleaned wscons/wskbdvar.h. Use the same attach arguments for
console and normal keyboards.
1998-04-09 13:09:45 +00:00
pk
03b9fa0bc1
Change last arg of `vct_mmap_cookie' from `int *' to `bus_space_handle_t *'.
1998-04-07 20:31:26 +00:00
leo
fe60e74148
Add hooks to make exclusive hardware locking possible. This is necessary
...
to make the driver suitable for the atari falcon.
1998-04-07 19:51:57 +00:00
drochner
0391896c27
Avoid namespace pollution.
1998-04-07 16:35:42 +00:00
drochner
2eea6bd8a4
We can't trust the "delay port" anymore - it doesn't work as expected on
...
newer chipsets. Use delay() instead.
Being here, remove BROKEN_INDIRECT_CONFIG.
1998-04-07 16:23:19 +00:00
drochner
ec9776e3ab
Fix calculation of console minor device number.
...
Being here, remove BROKEN_INDIRECT_CONFIG.
1998-04-07 16:06:33 +00:00
drochner
7ce1360e4a
Put some diagnostic output inside "#ifdef DIAGNOSTIC".
...
Being here, remove BROKEN_INDIRECT_CONFIG.
1998-04-07 16:02:25 +00:00
drochner
11da32b13c
Clean up diagnostic printouts.
...
Being here, remove BROKEN_INDIRECT_CONFIG.
1998-04-07 15:57:48 +00:00
hannken
244266226c
Fix typo.
1998-04-07 13:59:38 +00:00
hannken
47e698143a
Oops. Forgot RCS ident and copyright.
1998-04-07 13:57:56 +00:00
hannken
64f1bb73d6
Initial import of MI keyboard translation for dev/wscons.
1998-04-07 13:43:16 +00:00
matt
b80f703f77
Fix problem with promicuously received packets. (ie. give them to bpf
...
but not fddi_input).
1998-04-07 13:32:06 +00:00
enami
848e8406bc
The fe driver is spilt into ate, fmv and mbe, and this file is no longer
...
necessary.
1998-04-03 04:46:46 +00:00
enami
910e6420e0
Delete entry for fe*.
1998-04-03 04:44:39 +00:00
mycroft
eb466ba47f
Make sure to unload and recycle the DMA map for a bad received packet.
...
This was (indirectly) the reason for machines `hanging' (actually, looping in
tulip_rx_intr()) with de cards.
1998-04-02 13:49:32 +00:00
thorpej
5c85ae8778
Don't establish the interrupt handler just to read the MAC address.
1998-03-31 08:13:34 +00:00
pk
be4108fec1
Replace direct `sparc_bus_map()' calls with bus space map method.
1998-03-30 14:21:38 +00:00
hannken
b70a7e1752
Didn't compile: add variable `bit' removed by mycroft.
1998-03-30 10:35:03 +00:00
mycroft
d4da63c6c3
Eliminate cs_heldchar. It is not necessary in my version of the driver.
1998-03-30 02:41:21 +00:00
mycroft
5d8b98c7b1
Use a 4-bit table to speed up the CRC even further, without increasing the
...
code size too much.
1998-03-29 23:02:27 +00:00
mycroft
8f597a8744
Oops; make the table const.
1998-03-29 22:36:42 +00:00
mycroft
a6b8b01d96
Use a 4-bit table to speed up the CRC even further, without increasing the
...
code size too much.
1998-03-29 22:34:27 +00:00
mycroft
a3b1c4c87a
Optimize the address CRC routines a bit.
1998-03-29 22:21:12 +00:00
mycroft
fe7f32954b
Optimize the address CRC routines a bit.
1998-03-29 22:08:03 +00:00
enami
5c8a9ac444
Attach aic at isapnp.
1998-03-29 08:13:43 +00:00
enami
5124116592
ISAPnP attachment for aic6360 (tested with AHA-1520B).
1998-03-29 08:11:50 +00:00
christos
e0436952f0
Split out the verbose printing of scsi messages, so that user programs
...
can use the printing routines.
1998-03-28 21:57:08 +00:00
thorpej
686a1a1177
Regen.
1998-03-28 06:39:13 +00:00
thorpej
515d7f04bf
Add the Contaq/Cypress 82C693 PCI-ISA bridge.
1998-03-28 06:38:46 +00:00
cgd
2f8f14b311
check vendor against PCI_VENDOR_INVALID instead of 0xffff.
...
Suggested by Soren S. Jorvang.
1998-03-28 02:24:04 +00:00
cgd
6108f60999
regen
1998-03-28 02:10:40 +00:00
cgd
3371d8f00f
fix bogus produce name tags for 82371FB_ISA and 82371FB_IDE (were 82471FB_*).
...
Pointed out by Soren S. Jorvang. Rename "BAD" vendor id to "INVALID".
1998-03-28 02:09:29 +00:00
cgd
9264961c87
add a short delay (5ms) after ATAPI software reset is done, suggested by
...
Soren S. Jorvang <soren@t.dk>. Apparently some devices Really Want this.
1998-03-27 19:32:15 +00:00
drochner
46f85eeab2
let all 8 bits go through
1998-03-27 18:26:22 +00:00
drochner
cbff98f7ff
fix max() vs min() confusion at 2 places
1998-03-27 18:22:36 +00:00
thorpej
b9db388b0f
don't use variables declared _inside_ DEBUG in code _outside_ DEBUG
1998-03-26 00:49:03 +00:00
leo
0e4dce88d4
Conditionalize badblock handling on 'HAS_BAD144_HANDLING'. Some ports
...
(like atari) do not support it.
1998-03-25 09:58:24 +00:00
mjacob
57ca254137
some minor debug printout changes
1998-03-24 23:37:53 +00:00
mhitch
8adf8abfea
Enable another error message before the driver reboots the machine. It was
...
not being printed if not compiled with DEBUG. Now all situtiations where
the driver gives up should display a message before the reboot.
1998-03-24 20:49:22 +00:00
msaitoh
47d94e4676
fix typo
1998-03-23 16:57:21 +00:00
augustss
dbef68a11b
Update for __BROKEN_INDIRECT_CONFIG. Still untested since it is so hard
...
to find testers for these old cards.
1998-03-23 01:00:21 +00:00
mjacob
fc27ffd92c
update some debugging stuff- also turn off possible ULTRA mode for 1020s
1998-03-22 22:02:29 +00:00
mycroft
ff0635ab25
Fix error in previous change.
1998-03-22 19:36:52 +00:00
drochner
3c346a45ca
The keyboard controller's address range is 5 bytes long - reflect this
...
here.
1998-03-22 15:44:02 +00:00
drochner
2390332103
Devices attached to the PC keyboard controller (or its aux port),
...
for use with the new wscons code.
(keyboard map management will change)
1998-03-22 15:41:27 +00:00
drochner
b5ec34f082
MI driver for the infamous PC keyboard controller, primarily for use with
...
the new wscons code (but may be interfaced with other drivers as well).
needs testing
1998-03-22 15:25:15 +00:00
drochner
013507e321
PCI frontend for sys/dev/ic/vga.c
1998-03-22 15:16:18 +00:00
drochner
065733619a
ISA frontend for sys/dev/ic/vga.c
1998-03-22 15:14:35 +00:00
drochner
3a43fe7109
initial import of VGA driver backend for use with the new wscons code
1998-03-22 15:11:49 +00:00
drochner
b31e63865f
Initial import of cgd's new wscons code.
1998-03-22 14:24:02 +00:00
drochner
52c701add6
Make this file compile without BROKRN_INDIRECT_CONFIG.
...
(Brute force - device probe always returns 0. Should be fixed soon.)
1998-03-22 12:50:20 +00:00
drochner
5aaf839bc3
Make this file compile without BROKRN_INDIRECT_CONFIG.
...
(Brute force - device probe always returns 0. The driver is replaced
by if_ate, if_fmc and if_mbe and is here for reference only.)
1998-03-22 12:48:41 +00:00
jonathan
9a8dbd75df
Clone lk20.h (keycode definitions) to /sys/dev/dec.
...
Update source pmax files accordingly.
cvs remove old pmax/dev/lk201.h.
1998-03-22 09:27:07 +00:00
enami
a59689c939
Attach device `mbe' at bus `pcmcia'.
1998-03-22 04:39:56 +00:00
enami
e26f2ce65b
Define new device `ate' and `fmv'.
1998-03-22 04:38:42 +00:00
enami
c02747ba06
PCMCIA bus attachment for MB8696x based Ethernet card.
1998-03-22 04:32:27 +00:00
enami
2b5f7351d2
Split Fujitsu MB9696x based ethernet card driver into bus
...
dependent/independent code and bus.h'fied.
1998-03-22 04:25:36 +00:00
enami
1164bf0fb5
Define TPLFE_TYPE, which is sub code for CISTPL_FUNCE, for LAN card.
1998-03-22 04:07:43 +00:00
mycroft
f6dba67570
Read up to 32 bytes. The ESCC *needs* 8, and it doesn't hurt to leave some
...
slop in case there are clone chips with a deeper FIFO.
1998-03-22 02:36:02 +00:00
mycroft
2bb5067e13
Move the code to wait for carrier on a tty into a common function, since it
...
depends only on device-independent state bits.
Implement SunOS-style `dialout' devices.
1998-03-22 00:55:37 +00:00
mjacob
019508faee
Well, I don't have a Cyclades board, but I needed the alpha kernels
...
to compile. I made the changes that seemed to make sense tracking the
shift from TS_WOPEN to tp->t_wopen- but they may be wrong. I wasn't
subscribed to tech-kern so I missed the discussion, and C. Hannum
was not particularly enlightening. Sorry if this isn't quite right.
1998-03-21 23:26:15 +00:00
pk
69fe6f242f
Account for changed bus attachment scheme.
1998-03-21 20:11:30 +00:00
ragge
cad3cb3894
ubasetup() must be non-static. (used by QDSS)
1998-03-21 10:24:29 +00:00
mycroft
834a8ac07a
Fix pasto.
1998-03-21 04:31:10 +00:00
mycroft
fd620ebb32
Replace TS_WOPEN with t_wopen, per mail on tech-kern.
1998-03-21 04:29:29 +00:00
mycroft
16566cda09
Remove a bogus initializer.
1998-03-21 04:27:58 +00:00
mycroft
2ada4b4af1
Replace TS_WOPEN with t_wopen, per mail on tech-kern.
1998-03-21 04:02:47 +00:00
cgd
09cde3ae17
compile with -Wall, update for changes to dev/ofw
1998-03-21 02:06:17 +00:00
cgd
0a2c48d07f
-Wall
1998-03-21 02:05:17 +00:00
cgd
3cc8b411d0
-Wall (one real bug, even!)
1998-03-21 02:04:55 +00:00
cgd
bd31517508
check only the Vendor ID (rather than both the Vendor ID and the Product
...
ID) when determining if the Vendor ID is invalid. The spec says that
Vendor ID of 0xffff is invalid, so, it doesn't _matter_ what the product
ID is in that case. Treat Vendor ID 0 as invalid because we always have.
1998-03-20 19:56:19 +00:00
thorpej
f80f6601b0
Fix a typo in the bus_dma changes.
1998-03-17 21:30:38 +00:00
leo
d2551d5b3f
Use bus-dma functions.
1998-03-16 15:36:17 +00:00
mycroft
2397f92b38
Implement CDIOCCLOSE.
1998-03-16 04:17:53 +00:00
cgd
85687409e1
don't forget to set dma_arg, when using DMA functions. also, minor
...
spacing bogon cleanup. Pointed out by Kazuki Sakamoto in PR 5157.
1998-03-13 16:50:07 +00:00
cgd
b9eaff9db8
when considering attaching compatibility-mode channels, try a quick reset
...
and see if anything responds. if nothing (that's attributable to the
PCI IDE controller) responds, then that channel either has no devices on
it or has been disabled (via a non-standard mechanism) by the BIOS. If nothing
responds, don't map the compat.-mode interrupt or attach the wdc to that
channel, because the BIOS is likely to assign that IRQ to a different PCI
device. If that happens, the kernel will panic because that device will
try to map the IRQ level-triggered, but the compat interrupt will have been
mapped edge-triggered. (One possible way around this is to map the compat
interrupt edge-triggered, but it's not clear reading the spec that this
is correct or desirable.)
1998-03-12 23:34:29 +00:00
bouyer
44650d03a6
Better fix for PR 5113, per discussion with fvdl: now that the vnode locking
...
interface allow recusive locks, use it instead of the local hack to avoid
recursive locking.
1998-03-12 16:51:41 +00:00
augustss
09f43c63cf
Update probing for GUS a little. From soren@t.dk,
...
closes PR kern/5148.
1998-03-12 12:28:50 +00:00
leo
dd709a7f89
Make it possible to interface to big-endian cpu's.
1998-03-11 20:57:03 +00:00
augustss
d644f9b973
Apply cs4236 fix from rh@vip.at. Closes PR 5143.
1998-03-11 09:26:05 +00:00
christos
83449d8960
- fix pcmcia_scan_cis to return:
...
-1 error
0 desired tuple not found
1 desired tuple found
1998-03-09 21:54:13 +00:00
christos
441bea9142
- more 3c562 magic; document that the 0x88 tuple only works in 3c562a-c
...
and not in d where it goes back to use the eeprom method. So we detect
when the tuple method fails and fall back to the original method.
- even more 3c562 magic; the updated linux driver mentions that addresses
0x??00-0x??7f only work instead of the previous...
1998-03-09 21:52:31 +00:00
mikel
a57a8d66ff
let panic() call DDB, don't do it ourselves; from Nathan Williams in PR 5131
1998-03-09 06:32:51 +00:00
christos
509cb1d75f
- remove duplicate setting of CCR
...
- fix debugging code so that it compiles
- reorder the disabling code so that it is more logical
- add splhigh()/splx() in the first establish setting for symmetry
1998-03-07 17:58:17 +00:00
augustss
a294c3fef3
Regen.
1998-03-07 16:48:47 +00:00
augustss
8dd96862cd
Add Matrox Millenium II AGP.
1998-03-07 16:43:46 +00:00
scottr
8840acb1e2
Quirk table entries for IBM H3171 and Quantum ELS85S disks.
1998-03-07 06:34:59 +00:00
thorpej
5a34bf2a24
Add Dayna CommuniCard E, from Havard Eidnes, PR #5120 . Also, remove a
...
few unnecessary/no-longer-completely-accurate comments.
1998-03-06 20:00:28 +00:00
cgd
ff06be8ce0
reorganize mapping/attachment of wdc channels so that it'll be easier to
...
insert a check to see whether a channel appears to be enabled. Shouldn't
be necessary, according to the spec, but some PC chipsets allow individual
compatibility channels to be disabled. "I hate PCs."
1998-03-06 19:13:19 +00:00
cgd
f528463b81
despite the spec, some people map the bus master IDE registers into
...
memory space. Note that in a comment, but don't try to fix it (for now).
1998-03-06 17:41:59 +00:00
wrstuden
6dcfc62169
KNF last change
1998-03-05 22:56:18 +00:00
wrstuden
84c6b9dbd7
Make zs_iflush not loop indefinitly. Some Mac PowerBooks lie about having
...
two SCC channels, and can get stuck in an infinite loop. This change
stops after flushing 4 bytes. Might need upping to 8 bytes if we support
85230 ESCC's.
Idea bounced off of scottr & gwr
1998-03-05 22:03:34 +00:00
augustss
775d60ecd7
Use lower case "agc" for consistency.
1998-03-04 19:38:28 +00:00
cgd
2682c61855
clean up a printf
1998-03-04 19:19:21 +00:00
cgd
c3cdd2752a
slight cleanup (consistency, make a few comments better). add support
...
for recognizing bus-master DMA interface and mapping the regs (but
still no support for DMA).
1998-03-04 19:18:22 +00:00
cgd
0078e4bcd0
add def'ns for PCI IDE bus-master DMA interface recognition and register
...
mapping.
1998-03-04 19:17:10 +00:00
augustss
713692a2b5
For the Rx:Tx split message change "(undefined)" to "3:5".
1998-03-04 18:10:03 +00:00
fvdl
ad83e1aac8
Fix vn_lock argument botch. From Manuel Bouyer (PR 5113).
1998-03-04 15:34:41 +00:00
cgd
d4e79b6ace
add (commented out) device/file declarations for the MI PCI IDE
...
controller driver. These are commented out here until the wdc
declaration mess is resolved, and until then need to go into MD
files files in places where they play nice with the wdc declaration.
1998-03-04 06:38:44 +00:00
cgd
b37b33d302
PCI IDE glue. Right now, just glues 'wdc's to PCI IDE controller
...
channels. Eventually should do things like support PCI IDE DMA (it _DOES
NOT_ do that now).
1998-03-04 06:35:11 +00:00
cgd
b11fc105b1
clean up slightly, correct a few comments
1998-03-04 06:31:46 +00:00
cgd
5f45920f06
regen
1998-03-04 00:15:21 +00:00
cgd
b3f8c3c1f1
fix comment bogon in last commit
1998-03-04 00:14:45 +00:00
cgd
34f466e064
regen
1998-03-04 00:10:38 +00:00
cgd
0873649bda
add CMD PCI0643, PCI0647, USB0670, USB0673. Remove the 'A' from the 640A
...
entry (because the same product id is used for the 640B, as well). Note
that a few of the entries (PCI0642, PCI0650A) no longer have data to
be found on the CMD web site, and note that PCI0650A should probably have
its "A" trimmed as well.
1998-03-04 00:09:11 +00:00
cgd
8a2d9d7d74
in the ATAPI bug workaround code ("HACK"), don't forget to set
...
SCSI_AUTOCONF when executing SCSI commands.
1998-03-03 23:15:36 +00:00
pk
5ac38e9b53
Re-arrange several functions so we no longer need __BROKEN_INDIRECT_CONFIG
...
semantics.
1998-03-03 20:51:20 +00:00
pk
5513bc639f
Cheesily work-around reliance on __BROKEN_INDIRECT_CONFIG; should we
...
bother trying to find the board's memory size in the match routine at all?
1998-03-03 20:50:06 +00:00
augustss
44c6ce78d2
Avoid the name free so the MALLOCLOG option works again.
...
Fix some typos.
1998-03-03 09:16:15 +00:00
pk
d8bb682673
drop `ef_softc' from ef_match function.
1998-03-02 23:12:18 +00:00
ragge
8e2874bf64
Support for UVM on VAXen.
1998-03-02 17:00:00 +00:00
fvdl
7ba6a2daac
Remove extraneous files from Lite2 merge.
1998-03-01 13:45:28 +00:00
ross
331fee623e
Sweep up some miscellaneous leftover lite2 integration shrapnel.
1998-03-01 07:15:39 +00:00
fvdl
e5bc90f40c
Merge with Lite2 + local changes
1998-03-01 02:20:01 +00:00