korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

Browse Source 
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  splice: direct splicing updates ppos twice
  more ACSI removal
  umem: Fix match of pci_ids in umem driver
  umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
  remove the documentation for the legacy CDROM drivers
This commit is contained in:
Linus Torvalds 2007-07-16 10:48:20 -07:00
commit 14dc524972
27 changed files with 9 additions and 5517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/cdrom/00-INDEX
View File

@ -2,32 +2,10 @@
- this file (info on CD-ROMs and Linux)
Makefile
- only used to generate TeX output from the documentation.
aztcd
- info on Aztech/Orchid/Okano/Wearnes/Conrad/CyCDROM driver.
cdrom-standard.tex
- LaTeX document on standardizing the CD-ROM programming interface.
cdu31a
- info on the Sony CDU31A/CDU33A CD-ROM driver.
cm206
- info on the Philips/LMS cm206/cm260 CD-ROM driver.
gscd
- info on the Goldstar R420 CD-ROM driver.
ide-cd
- info on setting up and using ATAPI (aka IDE) CD-ROMs.
isp16
- info on the CD-ROM interface on ISP16, MAD16 or Mozart sound card.
mcd
- info on limitations of standard Mitsumi CD-ROM driver.
mcdx
- info on improved Mitsumi CD-ROM driver.
optcd
- info on the Optics Storage 8000 AT CD-ROM driver
packet-writing.txt
- Info on the CDRW packet writing module
sbpcd
- info on the SoundBlaster/Panasonic CD-ROM interface driver.
sjcd
- info on the SANYO CDR-H94A CD-ROM interface driver.
sonycd535
- info on the Sony CDU-535 (and 531) CD-ROM driver.

822
Documentation/cdrom/aztcd
View File

@ -1,822 +0,0 @@
$Id: README.aztcd,v 2.60 1997/11/29 09:51:25 root Exp root $
Readme-File Documentation/cdrom/aztcd
for
AZTECH CD-ROM CDA268-01A, ORCHID CD-3110,
OKANO/WEARNES CDD110, CONRAD TXC, CyCDROM CR520, CR540
CD-ROM Drives
Version 2.6 and newer
(for other drives see 6.-8.)
NOTE: THIS DRIVER WILL WORK WITH THE CD-ROM DRIVES LISTED, WHICH HAVE
A PROPRIETARY INTERFACE (implemented on a sound card or on an
ISA-AT-bus card).
IT WILL DEFINITELY NOT WORK WITH CD-ROM DRIVES WITH *IDE*-INTERFACE,
such as the Aztech CDA269-031SE !!! (The only known exceptions are
'faked' IDE drives like the CyCDROM CR520ie which work with aztcd
under certain conditions, see 7.). IF YOU'RE USING A CD-ROM DRIVE
WITH IDE-INTERFACE, SOMETIMES ALSO CALLED ATAPI-COMPATIBLE, PLEASE
USE THE ide-cd.c DRIVER, WRITTEN BY MARK LORD AND SCOTT SNYDER !
THE STANDARD-KERNEL 1.2.x NOW ALSO SUPPORTS IDE-CDROM-DRIVES, SEE THE
HARDDISK (!) SECTION OF make config, WHEN COMPILING A NEW KERNEL!!!
----------------------------------------------------------------------------
Contents of this file:
1. NOTE
2. INSTALLATION
3. CONFIGURING YOUR KERNEL
4. RECOMPILING YOUR KERNEL
4.1 AZTCD AS A RUN-TIME LOADABLE MODULE
4.2 CDROM CONNECTED TO A SOUNDCARD
5. KNOWN PROBLEMS, FUTURE DEVELOPMENTS
5.1 MULTISESSION SUPPORT
5.2 STATUS RECOGNITION
5.3 DOSEMU's CDROM SUPPORT
6. BUG REPORTS
7. OTHER DRIVES
8. IF YOU DON'T SUCCEED ... DEBUGGING
9. TECHNICAL HISTORY OF THE DRIVER
10. ACKNOWLEDGMENTS
11. PROGRAMMING ADD ONS: CDPLAY.C
APPENDIX: Source code of cdplay.c
----------------------------------------------------------------------------
1. NOTE
This software has been successfully in alpha and beta test and is part of
the standard kernel since kernel 1.1.8x since December 1994. It works with
AZTECH CDA268-01A, ORCHID CDS-3110, ORCHID/WEARNES CDD110 and CONRAD TXC
(Nr.99 31 23 -series 04) and has proven to be stable with kernel
versions 1.0.9 and newer. But with any software there still may be bugs in it.
So if you encounter problems, you are invited to help us improve this software.
Please send me a detailed bug report (see chapter BUG REPORTS). You are also
invited in helping us to increase the number of drives, which are supported.
Please read the README-files carefully and always keep a backup copy of your
old kernel, in order to reboot if something goes wrong!
2. INSTALLATION
The driver consists of a header file 'aztcd.h', which normally should reside
in /usr/src/linux/drivers/cdrom and the source code 'aztcd.c', which normally
resides in the same place. It uses /dev/aztcd (/dev/aztcd0 in some distri-
butions), which must be a valid block device with major number 29 and reside
in directory /dev. To mount a CD-ROM, your kernel needs to have the ISO9660-
filesystem support included.
PLEASE NOTE: aztcd.c has been developed in parallel to the linux kernel,
which had and is having many major and minor changes which are not backward
compatible. Quite definitely aztcd.c version 1.80 and newer will NOT work
in kernels older than 1.3.33. So please always use the most recent version
of aztcd.c with the appropriate linux-kernel.
3. CONFIGURING YOUR KERNEL
If your kernel is already configured for using the AZTECH driver you will
see the following message while Linux boots:
Aztech CD-ROM Init: DriverVersion=<version number> BaseAddress=<baseaddress>
Aztech CD-ROM Init: FirmwareVersion=<firmware version id of your I/O-card>>>
Aztech CD-ROM Init: <drive type> detected
Aztech CD-ROM Init: End
If the message looks different and you are sure to have a supported drive,
it may have a different base address. The Aztech driver does look for the
CD-ROM drive at the base address specified in aztcd.h at compile time. This
address can be overwritten by boot parameter aztcd=....You should reboot and
start Linux with boot parameter aztcd=<base address>, e.g. aztcd=0x320. If
you do not know the base address, start your PC with DOS and look at the boot
message of your CD-ROM's DOS driver. If that still does not help, use boot
parameter aztcd=<base address>,0x79 , this tells aztcd to try a little harder.
aztcd may be configured to use autoprobing the base address by recompiling
it (see chapter 4.).
If the message looks correct, as user 'root' you should be able to mount the
drive by
mount -t iso9660 -r /dev/aztcd0 /mnt
and use it as any other filesystem. (If this does not work, check if
/dev/aztcd0 and /mnt do exist and create them, if necessary by doing
mknod /dev/aztcd0 b 29 0
mkdir /mnt
If you still get a different message while Linux boots or when you get the
message, that the ISO9660-filesystem is not supported by your kernel, when
you try to mount the CD-ROM drive, you have to recompile your kernel.
If you do *not* have an Aztech/Orchid/Okano/Wearnes/TXC drive and want to
bypass drive detection during Linux boot up, start with boot parameter aztcd=0.
Most distributions nowadays do contain a boot disk image containing aztcd.
Please note, that this driver will not work with IDE/ATAPI drives! With these
you must use ide-cd.c instead.
4. RECOMPILING YOUR KERNEL
If your kernel is not yet configured for the AZTECH driver and the ISO9660-
filesystem, you have to recompile your kernel:
- Edit aztcd.h to set the I/O-address to your I/O-Base address (AZT_BASE_ADDR),
the driver does not use interrupts or DMA, so if you are using an AZTECH
CD268, an ORCHID CD-3110 or ORCHID/WEARNES CDD110 that's the only item you
have to set up. If you have a soundcard, read chapter 4.2.
Users of other drives should read chapter OTHER DRIVES of this file.
You also can configure that address by kernel boot parameter aztcd=...
- aztcd may be configured to use autoprobing the base address by setting
AZT_BASE_ADDR to '-1'. In that case aztcd probes the addresses listed
under AZT_BASE_AUTO. But please remember, that autoprobing always may
incorrectly influence other hardware components too!
- There are some other points, which may be configured, e.g. auto-eject the
CD when unmounting a drive, tray locking etc., see aztcd.h for details.
- If you're using a linux kernel version prior to 2.1.0, in aztcd.h
uncomment the line '#define AZT_KERNEL_PRIOR_2_1'
- Build a new kernel, configure it for 'Aztech/Orchid/Okano/Wearnes support'
(if you want aztcd to be part of the kernel). Do not configure it for
'Aztech... support', if you want to use aztcd as a run time loadable module.
But in any case you must have the ISO9660-filesystem included in your
kernel.
- Activate the new kernel, normally this is done by running LILO (don't for-
get to configure it before and to keep a copy of your old kernel in case
something goes wrong!).
- Reboot
- If you've included aztcd in your kernel, you now should see during boot
some messages like
Aztech CD-ROM Init: DriverVersion=<version number> BaseAddress=<baseaddress>
Aztech CD-ROM Init: FirmwareVersion=<firmware version id of your I/O-card>
Aztech CD-ROM Init: <drive type> detected
Aztech CD-ROM Init: End
- If you have not included aztcd in your kernel, but want to load aztcd as a
run time loadable module see 4.1.
- If the message looks correct, as user 'root' you should be able to mount
the drive by
mount -t iso9660 -r /dev/aztcd0 /mnt
and use it as any other filesystem. (If this does not work, check if
/dev/aztcd0 and /mnt do exist and create them, if necessary by doing
mknod /dev/aztcd0 b 29 0
mkdir /mnt
- If this still does not help, see chapters OTHER DRIVES and DEBUGGING.
4.1 AZTCD AS A RUN-TIME LOADABLE MODULE
If you do not need aztcd permanently, you can also load and remove the driver
during runtime via insmod and rmmod. To build aztcd as a loadable module you
must configure your kernel for AZTECH module support (answer 'm' when con-
figuring the kernel). Anyhow, you may run into problems, if the version of
your boot kernel is not the same than the source kernel version, from which
you create the modules. So rebuild your kernel, if necessary.
Now edit the base address of your AZTECH interface card in
/usr/src/linux/drivers/cdrom/aztcd.h to the appropriate value.
aztcd may be configured to use autoprobing the base address by setting
AZT_BASE_ADDR to '-1'. In that case aztcd probes the addresses listed
under AZT_BASE_AUTO. But please remember, that autoprobing always may
incorrectly influence other hardware components too!
There are also some special features which may be configured, e.g.
auto-eject a CD when unmounting the drive etc; see aztcd.h for details.
Then change to /usr/src/linux and do a
make modules
make modules_install
After that you can run-time load the driver via
insmod /lib/modules/X.X.X/misc/aztcd.o
and remove it via rmmod aztcd.
If you did not set the correct base address in aztcd.h, you can also supply the
base address when loading the driver via
insmod /lib/modules/X.X.X/misc/aztcd.o aztcd=<base address>
Again specifying aztcd=-1 will cause autoprobing.
If you do not have the iso9660-filesystem in your boot kernel, you also have
to load it before you can mount the CDROM:
insmod /lib/modules/X.X.X/fs/isofs.o
The mount procedure works as described in 4. above.
(In all commands 'X.X.X' is the current linux kernel version number)
4.2 CDROM CONNECTED TO A SOUNDCARD
Most soundcards do have a bus interface to the CDROM-drive. In many cases
this soundcard needs to be configured, before the CDROM can be used. This
configuration procedure consists of writing some kind of initialization
data to the soundcard registers. The AZTECH-CDROM driver in the moment does
only support one type of soundcard (SoundWave32). Users of other soundcards
should try to boot DOS first and let their DOS drivers initialize the
soundcard and CDROM, then warm boot (or use loadlin) their PC to start
Linux.
Support for the CDROM-interface of SoundWave32-soundcards is directly
implemented in the AZTECH driver. Please edit linux/drivers/cdrom/aztdc.h,
uncomment line '#define AZT_SW32' and set the appropriate value for
AZT_BASE_ADDR and AZT_SW32_BASE_ADDR. This support was tested with an Orchid
CDS-3110 connected to a SoundWave32.
If you want your soundcard to be supported, find out, how it needs to be
configured and mail me (see 6.) the appropriate information.
5. KNOWN PROBLEMS, FUTURE DEVELOPMENTS
5.1 MULTISESSION SUPPORT
Multisession support for CD's still is a myth. I implemented and tested a basic
support for multisession and XA CDs, but I still have not enough CDs and appli-
cations to test it rigorously. So if you'd like to help me, please contact me
(Email address see below). As of version 1.4 and newer you can enable the
multisession support in aztcd.h by setting AZT_MULTISESSION to 1. Doing so
will cause the ISO9660-filesystem to deal with multisession CDs, ie. redirect
requests to the Table of Contents (TOC) information from the last session,
which contains the info of all previous sessions etc.. If you do set
AZT_MULTISESSION to 0, you can use multisession CDs anyway. In that case the
drive's firmware will do automatic redirection. For the ISO9660-filesystem any
multisession CD will then look like a 'normal' single session CD. But never-
theless the data of all sessions are viewable and accessible. So with practical-
ly all real world applications you won't notice the difference. But as future
applications may make use of advanced multisession features, I've started to
implement the interface for the ISO9660 multisession interface via ioctl
CDROMMULTISESSION.
5.2 STATUS RECOGNITION
The drive status recognition does not work correctly in all cases. Changing
a disk or having the door open, when a drive is already mounted, is detected
by the Aztech driver itself, but nevertheless causes multiple read attempts
by the different layers of the ISO9660-filesystem driver, which finally timeout,
so you have to wait quite a little... But isn't it bad style to change a disk
in a mounted drive, anyhow ?!
The driver uses busy wait in most cases for the drive handshake (macros
STEN_LOW and DTEN_LOW). I tested with a 486/DX2 at 66MHz and a Pentium at
60MHz and 90MHz. Whenever you use a much faster machine you are likely to get
timeout messages. In that case edit aztcd.h and increase the timeout value
AZT_TIMEOUT.
For some 'slow' drive commands I implemented waiting with a timer waitqueue
(macro STEN_LOW_WAIT). If you get this timeout message, you may also edit
aztcd.h and increase the timeout value AZT_STATUS_DELAY. The waitqueue has
shown to be a little critical. If you get kernel panic messages, edit aztcd.c
and substitute STEN_LOW_WAIT by STEN_LOW. Busy waiting with STEN_LOW is more
stable, but also causes CPU overhead.
5.3 DOSEMU's CD-ROM SUPPORT
With release 1.20 aztcd was modified to allow access to CD-ROMS when running
under dosemu-0.60.0 aztcd-versions before 1.20 are most likely to crash
Linux, when a CD-ROM is accessed under dosemu. This problem has partly been
fixed, but still when accessing a directory for the first time the system
might hang for some 30sec. So be patient, when using dosemu's CD-ROM support
in combination with aztcd :-) !
This problem has now (July 1995) been fixed by a modification to dosemu's
CD-ROM driver. The new version came with dosemu-0.60.2, see dosemu's
README.CDROM.
6. BUG REPORTS
Please send detailed bug reports and bug fixes via EMail to
Werner.Zimmermann@fht-esslingen.de
Please include a description of your CD-ROM drive type and interface card,
the exact firmware message during Linux bootup, the version number of the
AZTECH-CDROM-driver and the Linux kernel version. Also a description of your
system's other hardware could be of interest, especially microprocessor type,
clock frequency, other interface cards such as soundcards, ethernet adapter,
game cards etc..
I will try to collect the reports and make the necessary modifications from
time to time. I may also come back to you directly with some bug fixes and
ask you to do further testing and debugging.
Editors of CD-ROMs are invited to send a 'cooperation' copy of their
CD-ROMs to the volunteers, who provided the CD-ROM support for Linux. My
snail mail address for such 'stuff' is
Prof. Dr. W. Zimmermann
Fachhochschule fuer Technik Esslingen
Fachbereich IT
Flandernstrasse 101
D-73732 Esslingen
Germany
7. OTHER DRIVES
The following drives ORCHID CDS3110, OKANO CDD110, WEARNES CDD110 and Conrad
TXC Nr. 993123-series 04 nearly look the same as AZTECH CDA268-01A, especially
they seem to use the same command codes. So it was quite simple to make the
AZTECH driver work with these drives.
Unfortunately I do not have any of these drives available, so I couldn't test
it myself. In some installations, it seems necessary to initialize the drive
with the DOS driver before (especially if combined with a sound card) and then
do a warm boot (CTRL-ALT-RESET) or start Linux from DOS, e.g. with 'loadlin'.
If you do not succeed, read chapter DEBUGGING. Thanks in advance!
Sorry for the inconvenience, but it is difficult to develop for hardware,
which you don't have available for testing. So if you like, please help us.
If you do have a CyCDROM CR520ie thanks to Hilmar Berger's help your chances
are good, that it will work with aztcd. The CR520ie is sold as an IDE-drive
and really is connected to the IDE interface (primary at 0x1F0 or secondary
at 0x170, configured as slave, not as master). Nevertheless it is not ATAPI
compatible but still uses Aztech's command codes.
8. DEBUGGING : IF YOU DON'T SUCCEED, TRY THE FOLLOWING
-reread the complete README file
-make sure, that your drive is hardware configured for
transfer mode: polled
IRQ: not used
DMA: not used
Base Address: something like 300, 320 ...
You can check this, when you start the DOS driver, which came with your
drive. By appropriately configuring the drive and the DOS driver you can
check, whether your drive does operate in this mode correctly under DOS. If
it does not operate under DOS, it won't under Linux.
If your drive's base address is something like 0x170 or 0x1F0 (and it is
not a CyCDROM CR520ie or CR 940ie) you most likely are having an IDE/ATAPI-
compatible drive, which is not supported by aztcd.c, use ide-cd.c instead.
Make sure the Base Address is configured correctly in aztcd.h, also make
sure, that /dev/aztcd0 exists with the correct major number (compare it with
the entry in file /usr/include/linux/major.h for the Aztech drive).
-insert a CD-ROM and close the tray
-cold boot your PC (i.e. via the power on switch or the reset button)
-if you start Linux via DOS, e.g. using loadlin, make sure, that the DOS
driver for the CD-ROM drive is not loaded (comment out the calling lines
in DOS' config.sys!)
-look for the aztcd: init message during Linux init and note them exactly
-log in as root and do a mount -t iso9660 /dev/aztcd0 /mnt
-if you don't succeed in the first time, try several times. Try also to open
and close the tray, then mount again. Please note carefully all commands
you typed in and the aztcd-messages, which you get.
-if you get an 'Aztech CD-ROM init: aborted' message, read the remarks about
the version string below.
If this does not help, do the same with the following differences
-start DOS before; make now sure, that the DOS driver for the CD-ROM is
loaded under DOS (i.e. uncomment it again in config.sys)
-warm boot your PC (i.e. via CTRL-ALT-DEL)
if you have it, you can also start via loadlin (try both).
...
Again note all commands and the aztcd-messages.
If you see STEN_LOW or STEN_LOW_WAIT error messages, increase the timeout
values.
If this still does not help,
-look in aztcd.c for the lines #if 0
#define AZT_TEST1
...
#endif
and substitute '#if 0' by '#if 1'.
-recompile your kernel and repeat the above two procedures. You will now get
a bundle of debugging messages from the driver. Again note your commands
and the appropriate messages. If you have syslogd running, these messages
may also be found in syslogd's kernel log file. Nevertheless in some
installations syslogd does not yet run, when init() is called, thus look for
the aztcd-messages during init, before the login-prompt appears.
Then look in aztcd.c, to find out, what happened. The normal calling sequence
is: aztcd_init() during Linux bootup procedure init()
after doing a 'mount -t iso9660 /dev/aztcd0 /mnt' the normal calling sequence is
aztcd_open() -> Status 2c after cold reboot with CDROM or audio CD inserted
-> Status 8 after warm reboot with CDROM inserted
-> Status 2e after cold reboot with no disk, closed tray
-> Status 6e after cold reboot, mount with door open
aztUpdateToc()
aztGetDiskInfo()
aztGetQChannelInfo() repeated several times
aztGetToc()
aztGetQChannelInfo() repeated several times
a list of track information
do_aztcd_request() }
azt_transfer() } repeated several times
azt_poll }
Check, if there is a difference in the calling sequence or the status flags!
There are a lot of other messages, eg. the ACMD-command code (defined in
aztcd.h), status info from the getAztStatus-command and the state sequence of
the finite state machine in azt_poll(). The most important are the status
messages, look how they are defined and try to understand, if they make
sense in the context where they appear. With a CD-ROM inserted the status
should always be 8, except in aztcd_open(). Try to open the tray, insert an
audio disk, insert no disk or reinsert the CD-ROM and check, if the status
bits change accordingly. The status bits are the most likely point, where
the drive manufacturers may implement changes.
If you still don't succeed, a good point to start is to look in aztcd.c in
function aztcd_init, where the drive should be detected during init. Do the
following:
-reboot the system with boot parameter 'aztcd=<your base address>,0x79'. With
parameter 0x79 most of the drive version detection is bypassed. After that
you should see the complete version string including leading and trailing
blanks during init.
Now adapt the statement
if ((result[1]=='A')&&(result[2]=='Z' ...)
in aztcd_init() to exactly match the first 3 or 4 letters you have seen.
-Another point is the 'smart' card detection feature in aztcd_init(). Normally
the CD-ROM drive is ready, when aztcd_init is trying to read the version
string and a time consuming ACMD_SOFT_RESET command can be avoided. This is
detected by looking, if AFL_OP_OK can be read correctly. If the CD-ROM drive
hangs in some unknown state, e.g. because of an error before a warm start or
because you first operated under DOS, even the version string may be correct,
but the following commands will not. Then change the code in such a way,
that the ACMD_SOFT_RESET is issued in any case, by substituting the
if-statement 'if ( ...=AFL_OP_OK)' by 'if (1)'.
If you succeed, please mail me the exact version string of your drive and
the code modifications, you have made together with a short explanation.
If you don't succeed, you may mail me the output of the debugging messages.
But remember, they are only useful, if they are exact and complete and you
describe in detail your hardware setup and what you did (cold/warm reboot,
with/without DOS, DOS-driver started/not started, which Linux-commands etc.)
9. TECHNICAL HISTORY OF THE DRIVER
The AZTECH-Driver is a rework of the Mitsumi-Driver. Four major items had to
be reworked:
a) The Mitsumi drive does issue complete status information acknowledging
each command, the Aztech drive does only signal that the command was
processed. So whenever the complete status information is needed, an extra
ACMD_GET_STATUS command is issued. The handshake procedure for the drive
can be found in the functions aztSendCmd(), sendAztCmd() and getAztStatus().
b) The Aztech Drive does not have a ACMD_GET_DISK_INFO command, so the
necessary info about the number of tracks (firstTrack, lastTrack), disk
length etc. has to be read from the TOC in the lead in track (see function
aztGetDiskInfo()).
c) Whenever data is read from the drive, the Mitsumi drive is started with a
command to read an indefinite (0xffffff) number of sectors. When the appropriate
number of sectors is read, the drive is stopped by a ACDM_STOP command. This
does not work with the Aztech drive. I did not find a way to stop it. The
stop and pause commands do only work in AUDIO mode but not in DATA mode.
Therefore I had to modify the 'finite state machine' in function azt_poll to
only read a certain number of sectors and then start a new read on demand. As I
have not completely understood, how the buffer/caching scheme of the Mitsumi
driver was implemented, I am not sure, if I have covered all cases correctly,
whenever you get timeout messages, the bug is most likely to be in that
function azt_poll() around switch(cmd) .... case ACD_S_DATA.
d) I did not get information about changing drive mode. So I doubt, that the
code around function azt_poll() case AZT_S_MODE does work. In my test I have
not been able to switch to reading in raw mode. For reading raw mode, Aztech
uses a different command than for cooked mode, which I only have implemen-
ted in the ioctl-section but not in the section which is used by the ISO9660.
The driver was developed on an AST PC with Intel 486/DX2, 8MB RAM, 340MB IDE
hard disk and on an AST PC with Intel Pentium 60MHz, 16MB RAM, 520MB IDE
running Linux kernel version 1.0.9 from the LST 1.8 Distribution. The kernel
was compiled with gcc.2.5.8. My CD-ROM drive is an Aztech CDA268-01A. My
drive says, that it has Firmware Version AZT26801A1.3. It came with an ISA-bus
interface card and works with polled I/O without DMA and without interrupts.
The code for all other drives was 'remote' tested and debugged by a number of
volunteers on the Internet.
Points, where I feel that possible problems might be and all points where I
did not completely understand the drive's behaviour or trust my own code are
marked with /*???*/ in the source code. There are also some parts in the
Mitsumi driver, where I did not completely understand their code.
10. ACKNOWLEDGMENTS
Without the help of P.Bush, Aztech, who delivered technical information
about the Aztech Drive and without the help of E.Moenkeberg, GWDG, who did a
great job in analyzing the command structure of various CD-ROM drives, this
work would not have been possible. E.Moenkeberg was also a great help in
making the software 'kernel ready' and in answering many of the CDROM-related
questions in the newsgroups. He really is *the* Linux CD-ROM guru. Thanks
also to all the guys on the Internet, who collected valuable technical
information about CDROMs.
Joe Nardone (joe@access.digex.net) was a patient tester even for my first
trial, which was more than slow, and made suggestions for code improvement.
Especially the 'finite state machine' azt_poll() was rewritten by Joe to get
clean C code and avoid the ugly 'gotos', which I copied from mcd.c.
Robby Schirmer (schirmer@fmi.uni-passau.de) tested the audio stuff (ioctls)
and suggested a lot of patches for them.
Joseph Piskor and Peter Nugent were the first users with the ORCHID CD3110
and also were very patient with the problems which occurred.
Reinhard Max delivered the information for the CDROM-interface of the
SoundWave32 soundcards.
Jochen Kunz and Olaf Kaluza delivered the information for supporting Conrad's
TXC drive.
Hilmar Berger delivered the patches for supporting CyCDROM CR520ie.
Anybody, who is interested in these items should have a look at 'ftp.gwdg.de',
directory 'pub/linux/cdrom' and at 'ftp.cdrom.com', directory 'pub/cdrom'.
11. PROGRAMMING ADD ONs: cdplay.c
You can use the ioctl-functions included in aztcd.c in your own programs. As
an example on how to do this, you will find a tiny CD Player for audio CDs
named 'cdplay.c'. It allows you to play audio CDs. You can play a specified
track, pause and resume or skip tracks forward and backwards. If you quit the
program without stopping the drive, playing is continued. You can also
(mis)use cdplay to read and hexdump data disks. You can find the code in the
APPENDIX of this file, which you should cut out with an editor and store in a
separate file 'cdplay.c'. To compile it and make it executable, do
gcc -s -Wall -O2 -L/usr/lib cdplay.c -o /usr/local/bin/cdplay # compiles it
chmod +755 /usr/local/bin/cdplay # makes it executable
ln -s /dev/aztcd0 /dev/cdrom # creates a link
(for /usr/lib substitute the top level directory, where your include files
reside, and for /usr/local/bin the directory, where you want the executable
binary to reside )
You have to set the correct permissions for cdplay *and* for /dev/mcd0 or
/dev/aztcd0 in order to use it. Remember, that you should not have /dev/cdrom
mounted, when you're playing audio CDs.
This program is just a hack for testing the ioctl-functions in aztcd.c. I will
not maintain it, so if you run into problems, discard it or have a look into
the source code 'cdplay.c'. The program does only contain a minimum of user
protection and input error detection. If you use the commands in the wrong
order or if you try to read a CD at wrong addresses, you may get error messages
or even hang your machine. If you get STEN_LOW, STEN_LOW_WAIT or segment violation
error messages when using cdplay, after that, the system might not be stable
any more, so you'd better reboot. As the ioctl-functions run in kernel mode,
most normal Linux-multitasking protection features do not work. By using
uninitialized 'wild' pointers etc., it is easy to write to other users' data
and program areas, destroy kernel tables etc.. So if you experiment with ioctls
as always when you are doing systems programming and kernel hacking, you
should have a backup copy of your system in a safe place (and you also
should try restoring from a backup copy first)!
A reworked and improved version called 'cdtester.c', which has yet more
features for testing CDROM-drives can be found in
Documentation/cdrom/sbpcd, written by E.Moenkeberg.
Werner Zimmermann
Fachhochschule fuer Technik Esslingen
(EMail: Werner.Zimmermann@fht-esslingen.de)
October, 1997
---------------------------------------------------------------------------
APPENDIX: Source code of cdplay.c
/* Tiny Audio CD Player
Copyright 1994, 1995, 1996 Werner Zimmermann (Werner.Zimmermann@fht-esslingen.de)
This program originally was written to test the audio functions of the
AZTECH.CDROM-driver, but it should work with every CD-ROM drive. Before
using it, you should set a symlink from /dev/cdrom to your real CDROM
device.
The GNU General Public License applies to this program.
History: V0.1 W.Zimmermann: First release. Nov. 8, 1994
V0.2 W.Zimmermann: Enhanced functionality. Nov. 9, 1994
V0.3 W.Zimmermann: Additional functions. Nov. 28, 1994
V0.4 W.Zimmermann: fixed some bugs. Dec. 17, 1994
V0.5 W.Zimmermann: clean 'scanf' commands without compiler warnings
Jan. 6, 1995
V0.6 W.Zimmermann: volume control (still experimental). Jan. 24, 1995
V0.7 W.Zimmermann: read raw modified. July 26, 95
*/
#include <stdio.h>
#include <ctype.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <linux/cdrom.h>
#include <linux/../../drivers/cdrom/aztcd.h>
void help(void)
{ printf("Available Commands: STOP s EJECT/CLOSE e QUIT q\n");
printf(" PLAY TRACK t PAUSE p RESUME r\n");
printf(" NEXT TRACK n REPEAT LAST l HELP h\n");
printf(" SUB CHANNEL c TRACK INFO i PLAY AT a\n");
printf(" READ d READ RAW w VOLUME v\n");
}
int main(void)
{ int handle;
unsigned char command=' ', ini=0, first=1, last=1;
unsigned int cmd, i,j,k, arg1,arg2,arg3;
struct cdrom_ti ti;
struct cdrom_tochdr tocHdr;
struct cdrom_subchnl subchnl;
struct cdrom_tocentry entry;
struct cdrom_msf msf;
union { struct cdrom_msf msf;
unsigned char buf[CD_FRAMESIZE_RAW];
} azt;
struct cdrom_volctrl volctrl;
printf("\nMini-Audio CD-Player V0.72 (C) 1994,1995,1996 W.Zimmermann\n");
handle=open("/dev/cdrom",O_RDWR);
ioctl(handle,CDROMRESUME);
if (handle<=0)
{ printf("Drive Error: already playing, no audio disk, door open\n");
printf(" or no permission (you must be ROOT in order to use this program)\n");
}
else
{ help();
while (1)
{ printf("Type command (h = help): ");
scanf("%s",&command);
switch (command)
{ case 'e': cmd=CDROMEJECT;
ioctl(handle,cmd);
break;
case 'p': if (!ini)
{ printf("Command not allowed - play track first\n");
}
else
{ cmd=CDROMPAUSE;
if (ioctl(handle,cmd)) printf("Drive Error\n");
}
break;
case 'r': if (!ini)
{ printf("Command not allowed - play track first\n");
}
else
{ cmd=CDROMRESUME;
if (ioctl(handle,cmd)) printf("Drive Error\n");
}
break;
case 's': cmd=CDROMPAUSE;
if (ioctl(handle,cmd)) printf("Drive error or already stopped\n");
cmd=CDROMSTOP;
if (ioctl(handle,cmd)) printf("Drive error\n");
break;
case 't': cmd=CDROMREADTOCHDR;
if (ioctl(handle,cmd,&tocHdr)) printf("Drive Error\n");
first=tocHdr.cdth_trk0;
last= tocHdr.cdth_trk1;
if ((first==0)||(first>last))
{ printf ("--could not read TOC\n");
}
else
{ printf("--first track: %d --last track: %d --enter track number: ",first,last);
cmd=CDROMPLAYTRKIND;
scanf("%i",&arg1);
ti.cdti_trk0=arg1;
if (ti.cdti_trk0<first) ti.cdti_trk0=first;
if (ti.cdti_trk0>last) ti.cdti_trk0=last;
ti.cdti_ind0=0;
ti.cdti_trk1=last;
ti.cdti_ind1=0;
if (ioctl(handle,cmd,&ti)) printf("Drive Error\n");
ini=1;
}
break;
case 'n': if (!ini++)
{ if (ioctl(handle,CDROMREADTOCHDR,&tocHdr)) printf("Drive Error\n");
first=tocHdr.cdth_trk0;
last= tocHdr.cdth_trk1;
ti.cdti_trk0=first-1;
}
if ((first==0)||(first>last))
{ printf ("--could not read TOC\n");
}
else
{ cmd=CDROMPLAYTRKIND;
if (++ti.cdti_trk0 > last) ti.cdti_trk0=last;
ti.cdti_ind0=0;
ti.cdti_trk1=last;
ti.cdti_ind1=0;
if (ioctl(handle,cmd,&ti)) printf("Drive Error\n");
ini=1;
}
break;
case 'l': if (!ini++)
{ if (ioctl(handle,CDROMREADTOCHDR,&tocHdr)) printf("Drive Error\n");
first=tocHdr.cdth_trk0;
last= tocHdr.cdth_trk1;
ti.cdti_trk0=first+1;
}
if ((first==0)||(first>last))
{ printf ("--could not read TOC\n");
}
else
{ cmd=CDROMPLAYTRKIND;
if (--ti.cdti_trk0 < first) ti.cdti_trk0=first;
ti.cdti_ind0=0;
ti.cdti_trk1=last;
ti.cdti_ind1=0;
if (ioctl(handle,cmd,&ti)) printf("Drive Error\n");
ini=1;
}
break;
case 'c': subchnl.cdsc_format=CDROM_MSF;
if (ioctl(handle,CDROMSUBCHNL,&subchnl))
printf("Drive Error\n");
else
{ printf("AudioStatus:%s Track:%d Mode:%d MSF=%d:%d:%d\n", \
subchnl.cdsc_audiostatus==CDROM_AUDIO_PLAY ? "PLAYING":"NOT PLAYING",\
subchnl.cdsc_trk,subchnl.cdsc_adr, \
subchnl.cdsc_absaddr.msf.minute, subchnl.cdsc_absaddr.msf.second, \
subchnl.cdsc_absaddr.msf.frame);
}
break;
case 'i': if (!ini)
{ printf("Command not allowed - play track first\n");
}
else
{ cmd=CDROMREADTOCENTRY;
printf("Track No.: ");
scanf("%d",&arg1);
entry.cdte_track=arg1;
if (entry.cdte_track<first) entry.cdte_track=first;
if (entry.cdte_track>last) entry.cdte_track=last;
entry.cdte_format=CDROM_MSF;
if (ioctl(handle,cmd,&entry))
{ printf("Drive error or invalid track no.\n");
}
else
{ printf("Mode %d Track, starts at %d:%d:%d\n", \
entry.cdte_adr,entry.cdte_addr.msf.minute, \
entry.cdte_addr.msf.second,entry.cdte_addr.msf.frame);
}
}
break;
case 'a': cmd=CDROMPLAYMSF;
printf("Address (min:sec:frame) ");
scanf("%d:%d:%d",&arg1,&arg2,&arg3);
msf.cdmsf_min0 =arg1;
msf.cdmsf_sec0 =arg2;
msf.cdmsf_frame0=arg3;
if (msf.cdmsf_sec0 > 59) msf.cdmsf_sec0 =59;
if (msf.cdmsf_frame0> 74) msf.cdmsf_frame0=74;
msf.cdmsf_min1=60;
msf.cdmsf_sec1=00;
msf.cdmsf_frame1=00;
if (ioctl(handle,cmd,&msf))
{ printf("Drive error or invalid address\n");
}
break;
#ifdef AZT_PRIVATE_IOCTLS /*not supported by every CDROM driver*/
case 'd': cmd=CDROMREADCOOKED;
printf("Address (min:sec:frame) ");
scanf("%d:%d:%d",&arg1,&arg2,&arg3);
azt.msf.cdmsf_min0 =arg1;
azt.msf.cdmsf_sec0 =arg2;
azt.msf.cdmsf_frame0=arg3;
if (azt.msf.cdmsf_sec0 > 59) azt.msf.cdmsf_sec0 =59;
if (azt.msf.cdmsf_frame0> 74) azt.msf.cdmsf_frame0=74;
if (ioctl(handle,cmd,&azt.msf))
{ printf("Drive error, invalid address or unsupported command\n");
}
k=0;
getchar();
for (i=0;i<128;i++)
{ printf("%4d:",i*16);
for (j=0;j<16;j++)
{ printf("%2x ",azt.buf[i*16+j]);
}
for (j=0;j<16;j++)
{ if (isalnum(azt.buf[i*16+j]))
printf("%c",azt.buf[i*16+j]);
else
printf(".");
}
printf("\n");
k++;
if (k>=20)
{ printf("press ENTER to continue\n");
getchar();
k=0;
}
}
break;
case 'w': cmd=CDROMREADRAW;
printf("Address (min:sec:frame) ");
scanf("%d:%d:%d",&arg1,&arg2,&arg3);
azt.msf.cdmsf_min0 =arg1;
azt.msf.cdmsf_sec0 =arg2;
azt.msf.cdmsf_frame0=arg3;
if (azt.msf.cdmsf_sec0 > 59) azt.msf.cdmsf_sec0 =59;
if (azt.msf.cdmsf_frame0> 74) azt.msf.cdmsf_frame0=74;
if (ioctl(handle,cmd,&azt))
{ printf("Drive error, invalid address or unsupported command\n");
}
k=0;
for (i=0;i<147;i++)
{ printf("%4d:",i*16);
for (j=0;j<16;j++)
{ printf("%2x ",azt.buf[i*16+j]);
}
for (j=0;j<16;j++)
{ if (isalnum(azt.buf[i*16+j]))
printf("%c",azt.buf[i*16+j]);
else
printf(".");
}
printf("\n");
k++;
if (k>=20)
{ getchar();
k=0;
}
}
break;
#endif
case 'v': cmd=CDROMVOLCTRL;
printf("--Channel 0 Left (0-255): ");
scanf("%d",&arg1);
printf("--Channel 1 Right (0-255): ");
scanf("%d",&arg2);
volctrl.channel0=arg1;
volctrl.channel1=arg2;
volctrl.channel2=0;
volctrl.channel3=0;
if (ioctl(handle,cmd,&volctrl))
{ printf("Drive error or unsupported command\n");
}
break;
case 'q': if (close(handle)) printf("Drive Error: CLOSE\n");
exit(0);
case 'h': help();
break;
default: printf("unknown command\n");
break;
}
}
}
return 0;
}

196
Documentation/cdrom/cdu31a
View File

@ -1,196 +0,0 @@
CDU31A/CDU33A Driver Info
-------------------------
Information on the Sony CDU31A/CDU33A CDROM driver for the Linux
kernel.
Corey Minyard (minyard@metronet.com)
Colossians 3:17
Crude Table of Contents
-----------------------
Setting Up the Hardware
Configuring the Kernel
Configuring as a Module
Driver Special Features
This device driver handles Sony CDU31A/CDU33A CDROM drives and
provides a complete block-level interface as well as an ioctl()
interface as specified in include/linux/cdrom.h). With this
interface, CDROMs can be accessed, standard audio CDs can be played
back normally, and CD audio information can be read off the drive.
Note that this will only work for CDU31A/CDU33A drives. Some vendors
market their drives as CDU31A compatible. They lie. Their drives are
really CDU31A hardware interface compatible (they can plug into the
same card). They are not software compatible.
Setting Up the Hardware
-----------------------
The CDU31A driver is unable to safely tell if an interface card is
present that it can use because the interface card does not announce
its presence in any way besides placing 4 I/O locations in memory. It
used to just probe memory and attempt commands, but Linus wisely asked
me to remove that because it could really screw up other hardware in
the system.
Because of this, you must tell the kernel where the drive interface
is, what interrupts are used, and possibly if you are on a PAS-16
soundcard.
If you have the Sony CDU31A/CDU33A drive interface card, the following
diagram will help you set it up. If you have another card, you are on
your own. You need to make sure that the I/O address and interrupt is
not used by another card in the system. You will need to know the I/O
address and interrupt you have set. Note that use of interrupts is
highly recommended, if possible, it really cuts down on CPU used.
Unfortunately, most soundcards do not support interrupts for their
CDROM interfaces. By default, the Sony interface card comes with
interrupts disabled.
+----------+-----------------+----------------------+
| JP1 | 34 Pin Conn | |
| JP2 +-----------------+ |
| JP3 |
| JP4 |
| +--+
| | +-+
| | | | External
| | | | Connector
| | | |
| | +-+
| +--+
| |
| +--------+
| |
+------------------------------------------+
JP1 sets the Base Address, using the following settings:
Address Pin 1 Pin 2
------- ----- -----
0x320 Short Short
0x330 Short Open
0x340 Open Short
0x360 Open Open
JP2 and JP3 configure the DMA channel; they must be set the same.
DMA Pin 1 Pin 2 Pin 3
--- ----- ----- -----
1 On Off On
2 Off On Off
3 Off Off On
JP4 Configures the IRQ:
IRQ Pin 1 Pin 2 Pin 3 Pin 4
--- ----- ----- ----- -----
3 Off Off On Off
4 Off Off* Off On
5 On Off Off Off
6 Off On Off Off
The documentation states to set this for interrupt
4, but I think that is a mistake.
Note that if you have another interface card, you will need to look at
the documentation to find the I/O base address. This is specified to
the SLCD.SYS driver for DOS with the /B: parameter, so you can look at
you DOS driver setup to find the address, if necessary.
Configuring the Kernel
----------------------
You must tell the kernel where the drive is at boot time. This can be
done at the Linux boot prompt, by using LILO, or by using Bootlin.
Note that this is no substitute for HOWTOs and LILO documentation, if
you are confused please read those for info on bootline configuration
and LILO.
At the linux boot prompt, press the ALT key and add the following line
after the boot name (you can let the kernel boot, it will tell you the
default boot name while booting):
cdu31a=<base address>,<interrupt>[,PAS]
The base address needs to have "0x" in front of it, since it is in
hex. For instance, to configure a drive at address 320 on interrupt 5,
use the following:
cdu31a=0x320,5
I use the following boot line:
cdu31a=0x1f88,0,PAS
because I have a PAS-16 which does not support interrupt for the
CDU31A interface.
Adding this as an append line at the beginning of the /etc/lilo.conf
file will set it for lilo configurations. I have the following as the
first line in my lilo.conf file:
append="cdu31a=0x1f88,0"
I'm not sure how to set up Bootlin (I have never used it), if someone
would like to fill in this section please do.
Configuring as a Module
-----------------------
The driver supports loading as a module. However, you must specify
the boot address and interrupt on the boot line to insmod. You can't
use modprobe to load it, since modprobe doesn't support setting
variables.
Anyway, I use the following line to load my driver as a module
/sbin/insmod /lib/modules/`uname -r`/misc/cdu31a.o cdu31a_port=0x1f88
You can set the following variables in the driver:
cdu31a_port=<I/O address> - sets the base I/O. If hex, put 0x in
front of it. This must be specified.
cdu31a_irq=<interrupt> - Sets the interrupt number. Leaving this
off will turn interrupts off.
Driver Special Features
-----------------------
This section describes features beyond the normal audio and CD-ROM
functions of the drive.
2048 byte buffer mode
If a disk is mounted with -o block=2048, data is copied straight from
the drive data port to the buffer. Otherwise, the readahead buffer
must be involved to hold the other 1K of data when a 1K block
operation is done. Note that with 2048 byte blocks you cannot execute
files from the CD.
XA compatibility
The driver should support XA disks for both the CDU31A and CDU33A. It
does this transparently, the using program doesn't need to set it.
Multi-Session
A multi-session disk looks just like a normal disk to the user. Just
mount one normally, and all the data should be there. A special
thanks to Koen for help with this!
Raw sector I/O
Using the CDROMREADAUDIO it is possible to read raw audio and data
tracks. Both operations return 2352 bytes per sector. On the data
tracks, the first 12 bytes is not returned by the drive and the value
of that data is indeterminate.

185
Documentation/cdrom/cm206
View File

@ -1,185 +0,0 @@
This is the readme file for the driver for the Philips/LMS cdrom drive
cm206 in combination with the cm260 host adapter card.
(c) 1995 David A. van Leeuwen
Changes since version 0.99
--------------------------
- Interfacing to the kernel is routed though an extra interface layer,
cdrom.c. This allows runtime-configurable `behavior' of the cdrom-drive,
independent of the driver.
Features since version 0.33
---------------------------
- Full audio support, that is, both workman, workbone and cdp work
now reasonably. Reading TOC still takes some time. xmcd has been
reported to run successfully.
- Made auto-probe code a little better, I hope
Features since version 0.28
---------------------------
- Full speed transfer rate (300 kB/s).
- Minimum kernel memory usage for buffering (less than 3 kB).
- Multisession support.
- Tray locking.
- Statistics of driver accessible to the user.
- Module support.
- Auto-probing of adapter card's base port and irq line,
also configurable at boot time or module load time.
Decide how you are going to use the driver. There are two
options:
(a) installing the driver as a resident part of the kernel
(b) compiling the driver as a loadable module
Further, you must decide if you are going to specify the base port
address and the interrupt request line of the adapter card cm260 as
boot options for (a), module parameters for (b), use automatic
probing of these values, or hard-wire your adaptor card's settings
into the source code. If you don't care, you can choose
autoprobing, which is the default. In that case you can move on to
the next step.
Compiling the kernel
--------------------
1) move to /usr/src/linux and do a
make config
If you have chosen option (a), answer yes to CONFIG_CM206 and
CONFIG_ISO9660_FS.
If you have chosen option (b), answer yes to CONFIG_MODVERSIONS
and no (!) to CONFIG_CM206 and CONFIG_ISO9660_FS.
2) then do a
make clean; make zImage; make modules
3) do the usual things to install a new image (backup the old one, run
`rdev -R zImage 1', copy the new image in place, run lilo). Might
be `make zlilo'.
Using the driver as a module
----------------------------
If you will only occasionally use the cd-rom driver, you can choose
option (b), install as a loadable module. You may have to re-compile
the module when you upgrade the kernel to a new version.
Since version 0.96, much of the functionality has been transferred to
a generic cdrom interface in the file cdrom.c. The module cm206.o
depends on cdrom.o. If the latter is not compiled into the kernel,
you must explicitly load it before cm206.o:
insmod /usr/src/linux/modules/cdrom.o
To install the module, you use the command, as root
insmod /usr/src/linux/modules/cm206.o
You can specify the base address on the command line as well as the irq
line to be used, e.g.
insmod /usr/src/linux/modules/cm206.o cm206=0x300,11
The order of base port and irq line doesn't matter; if you specify only
one, the other will have the value of the compiled-in default. You
may also have to install the file-system module `iso9660.o', if you
didn't compile that into the kernel.
Using the driver as part of the kernel
--------------------------------------
If you have chosen option (a), you can specify the base-port
address and irq on the lilo boot command line, e.g.:
LILO: linux cm206=0x340,11
This assumes that your linux kernel image keyword is `linux'.
If you specify either IRQ (3--11) or base port (0x300--0x370),
auto probing is turned off for both settings, thus setting the
other value to the compiled-in default.
Note that you can also put these parameters in the lilo configuration file:
# linux config
image = /vmlinuz
root = /dev/hda1
label = Linux
append = "cm206=0x340,11"
read-only
If module parameters and LILO config options don't work
-------------------------------------------------------
If autoprobing does not work, you can hard-wire the default values
of the base port address (CM206_BASE) and interrupt request line
(CM206_IRQ) into the file /usr/src/linux/drivers/cdrom/cm206.h. Change
the defines of CM206_IRQ and CM206_BASE.
Mounting the cdrom
------------------
1) Make sure that the right device is installed in /dev.
mknod /dev/cm206cd b 32 0
2) Make sure there is a mount point, e.g., /cdrom
mkdir /cdrom
3) mount using a command like this (run as root):
mount -rt iso9660 /dev/cm206cd /cdrom
4) For user-mounts, add a line in /etc/fstab
/dev/cm206cd /cdrom iso9660 ro,noauto,user
This will allow users to give the commands
mount /cdrom
umount /cdrom
If things don't work
--------------------
- Try to do a `dmesg' to find out if the driver said anything about
what is going wrong during the initialization.
- Try to do a `dd if=/dev/cm206cd | od -tc | less' to read from the
CD.
- Look in the /proc directory to see if `cm206' shows up under one of
`interrupts', `ioports', `devices' or `modules' (if applicable).
DISCLAIMER
----------
I cannot guarantee that this driver works, or that the hardware will
not be harmed, although I consider it most unlikely.
I hope that you'll find this driver in some way useful.
David van Leeuwen
david@tm.tno.nl
Note for Linux CDROM vendors
-----------------------------
You are encouraged to include this driver on your Linux CDROM. If
you do, you might consider sending me a free copy of that cd-rom.
You can contact me through my e-mail address, david@tm.tno.nl.
If this driver is compiled into a kernel to boot off a cdrom,
you should actually send me a free copy of that cd-rom.
Copyright
---------
The copyright of the cm206 driver for Linux is
(c) 1995 David A. van Leeuwen
The driver is released under the conditions of the GNU general public
license, which can be found in the file COPYING in the root of this
source tree.

60
Documentation/cdrom/gscd
View File

@ -1,60 +0,0 @@
Goldstar R420 CD-Rom device driver README
For all kind of other information about the GoldStar R420 CDROM
and this Linux device driver see the WWW page:
http://linux.rz.fh-hannover.de/~raupach
If you are the editor of a Linux CD, you should
enable gscd.c within your boot floppy kernel. Please,
send me one of your CDs for free.
This current driver version 0.4a only supports reading data from the disk.
Currently we have no audio and no multisession or XA support.
The polling interface is used, no DMA.
Sometimes the GoldStar R420 is sold in a 'Reveal Multimedia Kit'. This kit's
drive interface is compatible, too.
Installation
------------
Change to '/usr/src/linux/drivers/cdrom' and edit the file 'gscd.h'. Insert
the i/o address of your interface card.
The default base address is 0x340. This will work for most applications.
Address selection is accomplished by jumpers PN801-1 to PN801-4 on the
GoldStar Interface Card.
Appropriate settings are: 0x300, 0x310, 0x320, 0x330, 0x340, 0x350, 0x360
0x370, 0x380, 0x390, 0x3A0, 0x3B0, 0x3C0, 0x3D0, 0x3E0, 0x3F0
Then go back to '/usr/src/linux/' and 'make config' to build the new
configuration for your kernel. If you want to use the GoldStar driver
like a module, don't select 'GoldStar CDROM support'. By the way, you
have to include the iso9660 filesystem.
Now start compiling the kernel with 'make zImage'.
If you want to use the driver as a module, you have to do 'make modules'
and 'make modules_install', additionally.
Install your new kernel as usual - maybe you do it with 'make zlilo'.
Before you can use the driver, you have to
mknod /dev/gscd0 b 16 0
to create the appropriate device file (you only need to do this once).
If you use modules, you can try to insert the driver.
Say: 'insmod /usr/src/linux/modules/gscd.o'
or: 'insmod /usr/src/linux/modules/gscd.o gscd=<address>'
The driver should report its results.
That's it! Mount a disk, i.e. 'mount -rt iso9660 /dev/gscd0 /cdrom'
Feel free to report errors and suggestions to the following address.
Be sure, I'm very happy to receive your comments!
Oliver Raupach Hannover, Juni 1995
(raupach@nwfs1.rz.fh-hannover.de)

100
Documentation/cdrom/isp16
View File

@ -1,100 +0,0 @@
-- Documentation/cdrom/isp16
Docs by Eric van der Maarel <H.T.M.v.d.Maarel@marin.nl>
This is the README for version 0.6 of the cdrom interface on an
ISP16, MAD16 or Mozart sound card.
The detection and configuration of this interface used to be included
in both the sjcd and optcd cdrom driver. Drives supported by these
drivers came packed with Media Magic's multi media kit, which also
included the ISP16 card. The idea (thanks Leo Spiekman)
to move it from these drivers into a separate module and moreover, not to
rely on the MAD16 sound driver, are as follows:
-duplication of code in the kernel is a waste of resources and should
be avoided;
-however, kernels and notably those included with Linux distributions
(cf Slackware 3.0 included version 0.5 of the isp16 configuration
code included in the drivers) don't always come with sound support
included. Especially when they already include a bunch of cdrom drivers.
Hence, the cdrom interface should be configurable _independently_ of
sound support.
The ISP16, MAD16 and Mozart sound cards have an OPTi 82C928 or an
OPTi 82C929 chip. The interface on these cards should work with
any cdrom attached to the card, which is 'electrically' compatible
with Sanyo/Panasonic, Sony or Mitsumi non-ide drives. However, the
command sets for any proprietary drives may differ
(and hence may not be supported in the kernel) from these four types.
For a fact I know the interface works and the way of configuration
as described in this documentation works in combination with the
sjcd (in Sanyo/Panasonic compatibility mode) cdrom drivers
(probably with the optcd (in Sony compatibility mode) as well).
If you have such an OPTi based sound card and you want to use the
cdrom interface with a cdrom drive supported by any of the other cdrom
drivers, it will probably work. Please let me know any experience you
might have).
I understand that cards based on the OPTi 82C929 chips may be configured
(hardware jumpers that is) as an IDE interface. Initialisation of such a
card in this mode is not supported (yet?).
The suggestion to configure the ISP16 etc. sound card by booting DOS and
do a warm reboot to boot Linux somehow doesn't work, at least not
on my machine (IPC P90), with the OPTi 82C928 based card.
Booting the kernel through the boot manager LILO allows the use
of some command line options on the 'LILO boot:' prompt. At boot time
press Alt or Shift while the LILO prompt is written on the screen and enter
any kernel options. Alternatively these options may be used in
the appropriate section in /etc/lilo.conf. Adding 'append="<cmd_line_options>"'
will do the trick as well.
The syntax of 'cmd_line_options' is
isp16=[<port>[,<irq>[,<dma>]]][[,]<drive_type>]
If there is no ISP16 or compatibles detected, there's probably no harm done.
These options indicate the values that your cdrom drive has been (or will be)
configured to use.
Valid values for the base i/o address are:
port=0x340,0x320,0x330,0x360
for the interrupt request number
irq=0,3,5,7,9,10,11
for the direct memory access line
dma=0,3,5,6,7
and for the type of drive
drive_type=noisp16,Sanyo,Panasonic,Sony,Mitsumi.
Note that these options are case sensitive.
The values 0 for irq and dma indicate that they are not used, and
the drive will be used in 'polling' mode. The values 5 and 7 for irq
should be avoided in order to avoid any conflicts with optional
sound card configuration.
The syntax of the command line does not allow the specification of
irq when there's nothing specified for the base address and no
specification of dma when there is no specification of irq.
The value 'noisp16' for drive_type, which may be used as the first
non-integer option value (e.g. 'isp16=noisp16'), makes sure that probing
for and subsequent configuration of an ISP16-compatible card is skipped
all together. This can be useful to overcome possible conflicts which
may arise while the kernel is probing your hardware.
The default values are
port=0x340
irq=0
dma=0
drive_type=Sanyo
reflecting my own configuration. The defaults can be changed in
the file linux/drivers/cdrom/ips16.h.
The cdrom interface can be configured at run time by loading the
initialisation driver as a module. In that case, the interface
parameters can be set by giving appropriate values on the command
line. Configuring the driver can then be done by the following
command (assuming you have iso16.o installed in a proper place):
insmod isp16.o isp16_cdrom_base=<port> isp16_cdrom_irq=<irq> \
isp16_cdrom_dma=<dma> isp16_cdrom_type=<drive_type>
where port, irq, dma and drive_type can have any of the values mentioned
above.
Have fun!

29
Documentation/cdrom/mcdx
View File

@ -1,29 +0,0 @@
If you are using the driver as a module, you can specify your ports and IRQs
like
# insmod mcdx.o mcdx=0x300,11,0x304,5
and so on ("address,IRQ" pairs).
This will override the configuration in mcdx.h.
This driver:
o handles XA and (hopefully) multi session CDs as well as
ordinary CDs;
o supports up to 5 drives (of course, you'll need free
IRQs, i/o ports and slots);
o plays audio
This version doesn't support yet:
o shared IRQs (but it seems to be possible - I've successfully
connected two drives to the same irq. So it's `only' a
problem of the driver.)
This driver never will:
o Read digital audio (i.e. copy directly), due to missing
hardware features.
heiko@lotte.sax.de

57
Documentation/cdrom/optcd
View File

@ -1,57 +0,0 @@
This is the README file for the Optics Storage 8000 AT CDROM device driver.
This is the driver for the so-called 'DOLPHIN' drive, with the 34-pin
Sony-compatible interface. For the IDE-compatible Optics Storage 8001
drive, you will want the ATAPI CDROM driver. The driver also seems to
work with the Lasermate CR328A. If you have a drive that works with
this driver, and that doesn't report itself as DOLPHIN, please drop me
a mail.
The support for multisession CDs is in ALPHA stage. If you use it,
please mail me your experiences. Multisession support can be disabled
at compile time.
You can find some older versions of the driver at
dutette.et.tudelft.nl:/pub/linux/
and at Eberhard's mirror
ftp.gwdg.de:/pub/linux/cdrom/drivers/optics/
Before you can use the driver, you have to create the device file once:
# mknod /dev/optcd0 b 17 0
To specify the base address if the driver is "compiled-in" to your kernel,
you can use the kernel command line item (LILO option)
optcd=0x340
with the right address.
If you have compiled optcd as a module, you can load it with
# insmod /usr/src/linux/modules/optcd.o
or
# insmod /usr/src/linux/modules/optcd.o optcd=0x340
with the matching address value of your interface card.
The driver employs a number of buffers to do read-ahead and block size
conversion. The number of buffers is configurable in optcd.h, and has
influence on the driver performance. For my machine (a P75), 6 buffers
seems optimal, as can be seen from this table:
#bufs kb/s %cpu
1 97 0.1
2 191 0.3
3 188 0.2
4 246 0.3
5 189 19
6 280 0.4
7 281 7.0
8 246 2.8
16 281 3.4
If you get a throughput significantly below 300 kb/s, try tweaking
N_BUFS, and don't forget to mail me your results!
I'd appreciate success/failure reports. If you find a bug, try
recompiling the driver with some strategically chosen debug options
(these can be found in optcd.h) and include the messages generated in
your bug report. Good luck.
Leo Spiekman (spiekman@dutette.et.tudelft.nl)

1061
Documentation/cdrom/sbpcd
View File

File diff suppressed because it is too large Load Diff

60
Documentation/cdrom/sjcd
View File

@ -1,60 +0,0 @@
-- Documentation/cdrom/sjcd
80% of the work takes 20% of the time,
20% of the work takes 80% of the time...
(Murphy's law)
Once started, training can not be stopped...
(Star Wars)
This is the README for the sjcd cdrom driver, version 1.6.
This file is meant as a tips & tricks edge for the usage of the SANYO CDR-H94A
cdrom drive. It will grow as the questions arise. ;-)
For info on configuring the ISP16 sound card look at Documentation/cdrom/isp16.
The driver should work with any of the Panasonic, Sony or Mitsumi style
CDROM interfaces.
The cdrom interface on Media Magic's soft configurable sound card ISP16,
which used to be included in the driver, is now supported in a separate module.
This initialisation module will probably also work with other interfaces
based on an OPTi 82C928 or 82C929 chip (like MAD16 and Mozart): see the
documentation Documentation/cdrom/isp16.
The device major for sjcd is 18, and minor is 0. Create a block special
file in your /dev directory (e.g., /dev/sjcd) with these numbers.
(For those who don't know, being root and doing the following should do
the trick:
mknod -m 644 /dev/sjcd b 18 0
and mount the cdrom by /dev/sjcd).
The default configuration parameters are:
base address 0x340
no irq
no dma
(Actually the CDR-H94A doesn't know how to use irq and dma.)
As of version 1.2, setting base address at boot time is supported
through the use of command line options: type at the "boot:" prompt:
linux sjcd=<base_address>
(where you would use the kernel labeled "linux" in lilo's configuration
file /etc/lilo.conf). You could also use 'append="sjcd=<configuration_info>"'
in the appropriate section of /etc/lilo.conf
If you're building a kernel yourself you can set your default base
i/o address with SJCD_BASE_ADDR in /usr/src/linux/drivers/cdrom/sjcd.h.
The sjcd driver supports being loaded as a module. The following
command will set the base i/o address on the fly (assuming you
have installed the module in an appropriate place).
insmod sjcd.o sjcd_base=<base_address>
Have fun!
If something is wrong, please email to vadim@rbrf.ru
or vadim@ipsun.ras.ru
or model@cecmow.enet.dec.com
or H.T.M.v.d.Maarel@marin.nl
It happens sometimes that Vadim is not reachable by mail. For these
instances, Eric van der Maarel will help too.
Vadim V. Model, Eric van der Maarel, Eberhard Moenkeberg

122
Documentation/cdrom/sonycd535
View File

@ -1,122 +0,0 @@
README FOR LINUX SONY CDU-535/531 DRIVER
========================================
This is the Sony CDU-535 (and 531) driver version 0.7 for Linux.
I do not think I have the documentation to add features like DMA support
so if anyone else wants to pursue it or help me with it, please do.
(I need to see what was done for the CDU-31A driver -- perhaps I can
steal some of that code.)
This is a Linux device driver for the Sony CDU-535 CDROM drive. This is
one of the older Sony drives with its own interface card (Sony bus).
The DOS driver for this drive is named SONY_CDU.SYS - when you boot DOS
your drive should be identified as a SONY CDU-535. The driver works
with a CDU-531 also. One user reported that the driver worked on drives
OEM'ed by Procomm, drive and interface board were labelled Procomm.
The Linux driver is based on Corey Minyard's sonycd 0.3 driver for
the CDU-31A. Ron Jeppesen just changed the commands that were sent
to the drive to correspond to the CDU-535 commands and registers.
There were enough changes to let bugs creep in but it seems to be stable.
Ron was able to tar an entire CDROM (should read all blocks) and built
ghostview and xfig off Walnut Creek's X11R5/GNU CDROM. xcdplayer and
workman work with the driver. Others have used the driver without
problems except those dealing with wait loops (fixed in third release).
Like Minyard's original driver this one uses a polled interface (this
is also the default setup for the DOS driver). It has not been tried
with interrupts or DMA enabled on the board.
REQUIREMENTS
============
- Sony CDU-535 drive, preferably without interrupts and DMA
enabled on the card.
- Drive must be set up as unit 1. Only the first unit will be
recognized
- You must enter your interface address into
/usr/src/linux/drivers/cdrom/sonycd535.h and build the
appropriate kernel or use the "kernel command line" parameter
sonycd535=0x320
with the correct interface address.
NOTES:
======
1) The drive MUST be turned on when booting or it will not be recognized!
(but see comments on modularized version below)
2) when the cdrom device is opened the eject button is disabled to keep the
user from ejecting a mounted disk and replacing it with another.
Unfortunately xcdplayer and workman also open the cdrom device so you
have to use the eject button in the software. Keep this in mind if your
cdrom player refuses to give up its disk -- exit workman or xcdplayer, or
umount the drive if it has been mounted.
THANKS
======
Many thanks to Ron Jeppesen (ronj.an@site007.saic.com) for getting
this project off the ground. He wrote the initial release
and the first two patches to this driver (0.1, 0.2, and 0.3).
Thanks also to Eberhard Moenkeberg (emoenke@gwdg.de) for prodding
me to place this code into the mainstream Linux source tree
(as of Linux version 1.1.91), as well as some patches to make
it a better device citizen. Further thanks to Joel Katz
<joelkatz@webchat.org> for his MODULE patches (see details below),
Porfiri Claudio <C.Porfiri@nisms.tei.ericsson.se> for patches
to make the driver work with the older CDU-510/515 series, and
Heiko Eissfeldt <heiko@colossus.escape.de> for pointing out that
the verify_area() checks were ignoring the results of said checks
(note: verify_area() has since been replaced by access_ok()).
(Acknowledgments from Ron Jeppesen in the 0.3 release:)
Thanks to Corey Minyard who wrote the original CDU-31A driver on which
this driver is based. Thanks to Ken Pizzini and Bob Blair who provided
patches and feedback on the first release of this driver.
Ken Pizzini
ken@halcyon.com
------------------------------------------------------------------------------
(The following is from Joel Katz <joelkatz@webchat.org>.)
To build a version of sony535.o that can be installed as a module,
use the following command:
gcc -c -D__KERNEL__ -DMODULE -O2 sonycd535.c -o sonycd535.o
To install the module, simply type:
insmod sony535.o
or
insmod sony535.o sonycd535=<address>
And to remove it:
rmmod sony535
The code checks to see if MODULE is defined and behaves as it used
to if MODULE is not defined. That means your patched file should behave
exactly as it used to if compiled into the kernel.
I have an external drive, and I usually leave it powered off. I used
to have to reboot if I needed to use the CDROM drive. Now I don't.
Even if you have an internal drive, why waste the 96K of memory
(unswappable) that the driver uses if you use your CD-ROM drive infrequently?
This driver will not install (whether compiled in or loaded as a
module) if the CDROM drive is not available during its initialization. This
means that you can have the driver compiled into the kernel and still load
the module later (assuming the driver doesn't install itself during
power-on). This only wastes 12K when you boot with the CDROM drive off.
This is what I usually do; I leave the driver compiled into the
kernel, but load it as a module if I powered the system up with the drive
off and then later decided to use the CDROM drive.
Since the driver only uses a single page to point to the chunks,
attempting to set the buffer cache to more than 2 Megabytes would be very
bad; don't do that.

37
Documentation/kernel-parameters.txt
View File

@ -34,7 +34,6 @@ parameter is applicable:
APIC APIC support is enabled.
APM Advanced Power Management support is enabled.
AX25 Appropriate AX.25 support is enabled.
CD Appropriate CD support is enabled.
DRM Direct Rendering Management support is enabled.
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
EFI EFI Partitioning (GPT) is enabled
@ -319,9 +318,6 @@ and is between 256 and 4096 characters. It is defined in the file
autotest [IA64]
aztcd= [HW,CD] Aztech CD268 CDROM driver
Format: <io>,0x79 (?)
baycom_epp= [HW,AX25]
Format: <io>,<mode>
@ -364,10 +360,6 @@ and is between 256 and 4096 characters. It is defined in the file
possible to determine what the correct size should be.
This option provides an override for these situations.
cdu31a= [HW,CD]
Format: <io>,<irq>[,PAS]
See header of drivers/cdrom/cdu31a.c.
chandev= [HW,NET] Generic channel device initialisation
checkreqprot [SELINUX] Set initial checkreqprot flag value.
@ -421,9 +413,6 @@ and is between 256 and 4096 characters. It is defined in the file
hpet= [IA-32,HPET] option to disable HPET and use PIT.
Format: disable
cm206= [HW,CD]
Format: { auto | [<io>,][<irq>] }
com20020= [HW,NET] ARCnet - COM20020 chipset
Format:
<io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]
@ -660,9 +649,6 @@ and is between 256 and 4096 characters. It is defined in the file
gpt [EFI] Forces disk with valid GPT signature but
invalid Protective MBR to be treated as GPT.
gscd= [HW,CD]
Format: <io>
gvp11= [HW,SCSI]
hashdist= [KNL,NUMA] Large hashes allocated during boot
@ -826,9 +812,6 @@ and is between 256 and 4096 characters. It is defined in the file
tasks in the system -- can cause problems and
suboptimal load balancer performance.
isp16= [HW,CD]
Format: <io>,<irq>,<dma>,<setup>
iucv= [HW,NET]
js= [HW,JOY] Analog joystick
@ -967,11 +950,6 @@ and is between 256 and 4096 characters. It is defined in the file
mcatest= [IA-64]
mcd= [HW,CD]
Format: <port>,<irq>,<mitsumi_bug_93_wait>
mcdx= [HW,CD]
mce [IA-32] Machine Check Exception
md= [HW] RAID subsystems devices and level
@ -1204,9 +1182,6 @@ and is between 256 and 4096 characters. It is defined in the file
oprofile.timer= [HW]
Use timer interrupt instead of performance counters
optcd= [HW,CD]
Format: <io>
osst= [HW,SCSI] SCSI Tape Driver
Format: <buffer_size>,<write_threshold>
See also Documentation/scsi/st.txt.
@ -1522,11 +1497,6 @@ and is between 256 and 4096 characters. It is defined in the file
sbni= [NET] Granch SBNI12 leased line adapter
sbpcd= [HW,CD] Soundblaster CD adapter
Format: <io>,<type>
See a comment before function sbpcd_setup() in
drivers/cdrom/sbpcd.c.
sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver
Format: <io>[,<timeout>[,<isapnp>]]
@ -1579,10 +1549,6 @@ and is between 256 and 4096 characters. It is defined in the file
simeth= [IA-64]
simscsi=
sjcd= [HW,CD]
Format: <io>,<irq>,<dma>
See header of drivers/cdrom/sjcd.c.
slram= [HW,MTD]
slub_debug[=options[,slabs]] [MM, SLUB]
@ -1759,9 +1725,6 @@ and is between 256 and 4096 characters. It is defined in the file
snd-ymfpci= [HW,ALSA]
sonycd535= [HW,CD]
Format: <io>[,<irq>]
sonypi.*= [HW] Sony Programmable I/O Control Device driver
See Documentation/sonypi.txt

7
Documentation/m68k/kernel-options.txt
View File

@ -82,13 +82,6 @@ Valid names are:
/dev/fd : -> 0x0200 (floppy disk)
/dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k)
/dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k)
/dev/ada: -> 0x1c00 (first ACSI device)
/dev/adb: -> 0x1c10 (second ACSI device)
/dev/adc: -> 0x1c20 (third ACSI device)
/dev/add: -> 0x1c30 (forth ACSI device)
The last four names are available only if the kernel has been compiled
with Atari and ACSI support.
The name must be followed by a decimal number, that stands for the
partition number. Internally, the value of the number is just

6
Documentation/networking/net-modules.txt
View File

@ -146,12 +146,6 @@ at1700.c:
irq = 0
(Probes ports: 0x260, 0x280, 0x2A0, 0x240, 0x340, 0x320, 0x380, 0x300)
atari_bionet.c:
Supports full autoprobing. (m68k/Atari)
atari_pamsnet.c:
Supports full autoprobing. (m68k/Atari)
atarilance.c:
Supports full autoprobing. (m68k/Atari)

12
MAINTAINERS
View File

@ -2613,12 +2613,6 @@ M: yokota@netlab.is.tsukuba.ac.jp
W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
S: Maintained
NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
P: Eberhard Moenkeberg
M: emoenke@gwdg.de
L: linux-kernel@vger.kernel.org
S: Maintained
NTFS FILESYSTEM
P: Anton Altaparmakov
M: aia21@cantab.net
@ -3105,12 +3099,6 @@ M: michael@mihu.de
W: http://www.mihu.de/linux/saa7146
S: Maintained
SBPCD CDROM DRIVER
P: Eberhard Moenkeberg
M: emoenke@gwdg.de
L: linux-kernel@vger.kernel.org
S: Maintained
SC1200 WDT DRIVER
P: Zwane Mwaikambo
M: zwane@arm.linux.org.uk

11
drivers/block/Kconfig
View File

@ -59,17 +59,6 @@ config AMIGA_Z2RAM
To compile this driver as a module, choose M here: the
module will be called z2ram.
config ATARI_SLM
tristate "Atari SLM laser printer support"
depends on ATARI
help
If you have an Atari SLM laser printer, say Y to include support for
it in the kernel. Otherwise, say N. This driver is also available as
a module ( = code which can be inserted in and removed from the
running kernel whenever you want). The module will be called
acsi_slm. Be warned: the driver needs much ST-RAM and can cause
problems due to that fact!
config BLK_DEV_XD
tristate "XT hard disk support"
depends on ISA && ISA_DMA_API

1
drivers/block/Makefile
View File

@ -9,7 +9,6 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o
obj-$(CONFIG_BLK_DEV_FD) += floppy.o
obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o
obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
obj-$(CONFIG_ATARI_SLM) += acsi_slm.o
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
obj-$(CONFIG_BLK_DEV_RAM) += rd.o
obj-$(CONFIG_BLK_DEV_LOOP) += loop.o

1032
drivers/block/acsi_slm.c
View File

File diff suppressed because it is too large Load Diff

58
drivers/block/umem.c
View File

@ -105,12 +105,6 @@ struct cardinfo {
unsigned long csr_base;
unsigned char __iomem *csr_remap;
unsigned long csr_len;
#ifdef CONFIG_MM_MAP_MEMORY
unsigned long mem_base;
unsigned char __iomem *mem_remap;
unsigned long mem_len;
#endif
unsigned int win_size; /* PCI window size */
unsigned int mm_size; /* size in kbytes */
@ -872,10 +866,6 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
card->csr_base = pci_resource_start(dev, 0);
card->csr_len = pci_resource_len(dev, 0);
#ifdef CONFIG_MM_MAP_MEMORY
card->mem_base = pci_resource_start(dev, 1);
card->mem_len = pci_resource_len(dev, 1);
#endif
printk(KERN_INFO "Micro Memory(tm) controller #%d found at %02x:%02x (PCI Mem Module (Battery Backup))\n",
card->card_number, dev->bus->number, dev->devfn);
@ -903,27 +893,6 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
printk(KERN_INFO "MM%d: CSR 0x%08lx -> 0x%p (0x%lx)\n", card->card_number,
card->csr_base, card->csr_remap, card->csr_len);
#ifdef CONFIG_MM_MAP_MEMORY
if (!request_mem_region(card->mem_base, card->mem_len, "Micro Memory")) {
printk(KERN_ERR "MM%d: Unable to request memory region\n", card->card_number);
ret = -ENOMEM;
goto failed_req_mem;
}
if (!(card->mem_remap = ioremap(card->mem_base, cards->mem_len))) {
printk(KERN_ERR "MM%d: Unable to remap memory region\n", card->card_number);
ret = -ENOMEM;
goto failed_remap_mem;
}
printk(KERN_INFO "MM%d: MEM 0x%8lx -> 0x%8lx (0x%lx)\n", card->card_number,
card->mem_base, card->mem_remap, card->mem_len);
#else
printk(KERN_INFO "MM%d: MEM area not remapped (CONFIG_MM_MAP_MEMORY not set)\n",
card->card_number);
#endif
switch(card->dev->device) {
case 0x5415:
card->flags |= UM_FLAG_NO_BYTE_STATUS | UM_FLAG_NO_BATTREG;
@ -1091,12 +1060,6 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
card->mm_pages[1].desc,
card->mm_pages[1].page_dma);
failed_magic:
#ifdef CONFIG_MM_MAP_MEMORY
iounmap(card->mem_remap);
failed_remap_mem:
release_mem_region(card->mem_base, card->mem_len);
failed_req_mem:
#endif
iounmap(card->csr_remap);
failed_remap_csr:
release_mem_region(card->csr_base, card->csr_len);
@ -1116,10 +1079,6 @@ static void mm_pci_remove(struct pci_dev *dev)
tasklet_kill(&card->tasklet);
iounmap(card->csr_remap);
release_mem_region(card->csr_base, card->csr_len);
#ifdef CONFIG_MM_MAP_MEMORY
iounmap(card->mem_remap);
release_mem_region(card->mem_base, card->mem_len);
#endif
free_irq(card->irq, card);
if (card->mm_pages[0].desc)
@ -1133,23 +1092,18 @@ static void mm_pci_remove(struct pci_dev *dev)
blk_cleanup_queue(card->queue);
}
static const struct pci_device_id mm_pci_ids[] = { {
.vendor = PCI_VENDOR_ID_MICRO_MEMORY,
.device = PCI_DEVICE_ID_MICRO_MEMORY_5415CN,
}, {
.vendor = PCI_VENDOR_ID_MICRO_MEMORY,
.device = PCI_DEVICE_ID_MICRO_MEMORY_5425CN,
}, {
.vendor = PCI_VENDOR_ID_MICRO_MEMORY,
.device = PCI_DEVICE_ID_MICRO_MEMORY_6155,
}, {
static const struct pci_device_id mm_pci_ids[] = {
{PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5415CN)},
{PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5425CN)},
{PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_6155)},
{
.vendor = 0x8086,
.device = 0xB555,
.subvendor= 0x1332,
.subdevice= 0x5460,
.class = 0x050000,
.class_mask= 0,
}, { /* end: all zeroes */ }
}, { /* end: all zeroes */ }
};
MODULE_DEVICE_TABLE(pci, mm_pci_ids);

16
drivers/net/Kconfig
View File

@ -405,22 +405,6 @@ config ATARILANCE
on the AMD Lance chipset: RieblCard (with or without battery), or
PAMCard VME (also the version by Rhotron, with different addresses).
config ATARI_BIONET
tristate "BioNet-100 support"
depends on ATARI && ATARI_ACSI && BROKEN
help
Say Y to include support for BioData's BioNet-100 Ethernet adapter
for the ACSI port. The driver works (has to work...) with a polled
I/O scheme, so it's rather slow :-(
config ATARI_PAMSNET
tristate "PAMsNet support"
depends on ATARI && ATARI_ACSI && BROKEN
help
Say Y to include support for the PAMsNet Ethernet adapter for the
ACSI port ("ACSI node"). The driver works (has to work...) with a
polled I/O scheme, so it's rather slow :-(
config SUN3LANCE
tristate "Sun3/Sun3x on-board LANCE support"
depends on SUN3 || SUN3X

2
drivers/net/Makefile
View File

@ -181,8 +181,6 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
obj-$(CONFIG_DECLANCE) += declance.o
obj-$(CONFIG_ATARILANCE) += atarilance.o
obj-$(CONFIG_ATARI_BIONET) += atari_bionet.o
obj-$(CONFIG_ATARI_PAMSNET) += atari_pamsnet.o
obj-$(CONFIG_A2065) += a2065.o
obj-$(CONFIG_HYDRA) += hydra.o
obj-$(CONFIG_ARIADNE) += ariadne.o

8
drivers/net/Space.c
View File

@ -75,8 +75,6 @@ extern struct net_device *atarilance_probe(int unit);
extern struct net_device *sun3lance_probe(int unit);
extern struct net_device *sun3_82586_probe(int unit);
extern struct net_device *apne_probe(int unit);
extern struct net_device *bionet_probe(int unit);
extern struct net_device *pamsnet_probe(int unit);
extern struct net_device *cs89x0_probe(int unit);
extern struct net_device *hplance_probe(int unit);
extern struct net_device *bagetlance_probe(int unit);
@ -264,12 +262,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
#ifdef CONFIG_APNE /* A1200 PCMCIA NE2000 */
{apne_probe, 0},
#endif
#ifdef CONFIG_ATARI_BIONET /* Atari Bionet Ethernet board */
{bionet_probe, 0},
#endif
#ifdef CONFIG_ATARI_PAMSNET /* Atari PAMsNet Ethernet board */
{pamsnet_probe, 0},
#endif
#ifdef CONFIG_MVME147_NET /* MVME147 internal Ethernet */
{mvme147lance_probe, 0},
#endif

675
drivers/net/atari_bionet.c
View File

@ -1,675 +0,0 @@
/* bionet.c BioNet-100 device driver for linux68k.
*
* Version: @(#)bionet.c 1.0 02/06/96
*
* Author: Hartmut Laue <laue@ifk-mp.uni-kiel.de>
* and Torsten Narjes <narjes@ifk-mp.uni-kiel.de>
*
* Little adaptions for integration into pl7 by Roman Hodek
*
* Some changes in bionet_poll_rx by Karl-Heinz Lohner
*
What is it ?
------------
This driver controls the BIONET-100 LAN-Adapter which connects
an ATARI ST/TT via the ACSI-port to an Ethernet-based network.
This version can be compiled as a loadable module (See the
compile command at the bottom of this file).
At load time, you can optionally set the debugging level and the
fastest response time on the command line of 'insmod'.
'bionet_debug'
controls the amount of diagnostic messages:
0 : no messages
>0 : see code for meaning of printed messages
'bionet_min_poll_time' (always >=1)
gives the time (in jiffies) between polls. Low values
increase the system load (beware!)
When loaded, a net device with the name 'bio0' becomes available,
which can be controlled with the usual 'ifconfig' command.
It is possible to compile this driver into the kernel like other
(net) drivers. For this purpose, some source files (e.g. config-files
makefiles, Space.c) must be changed accordingly. (You may refer to
other drivers how to do it.) In this case, the device will be detected
at boot time and (probably) appear as 'eth0'.
This code is based on several sources:
- The driver code for a parallel port ethernet adapter by
Donald Becker (see file 'atp.c' from the PC linux distribution)
- The ACSI code by Roman Hodek for the ATARI-ACSI harddisk support
and DMA handling.
- Very limited information about moving packets in and out of the
BIONET-adapter from the TCP package for TOS by BioData GmbH.
Theory of Operation
-------------------
Because the ATARI DMA port is usually shared between several
devices (eg. harddisk, floppy) we cannot block the ACSI bus
while waiting for interrupts. Therefore we use a polling mechanism
to fetch packets from the adapter. For the same reason, we send
packets without checking that the previous packet has been sent to
the LAN. We rely on the higher levels of the networking code to detect
missing packets and resend them.
Before we access the ATARI DMA controller, we check if another
process is using the DMA. If not, we lock the DMA, perform one or
more packet transfers and unlock the DMA before returning.
We do not use 'stdma_lock' unconditionally because it is unclear
if the networking code can be set to sleep, which will happen if
another (possibly slow) device is using the DMA controller.
The polling is done via timer interrupts which periodically
'simulate' an interrupt from the Ethernet adapter. The time (in jiffies)
between polls varies depending on an estimate of the net activity.
The allowed range is given by the variable 'bionet_min_poll_time'
for the lower (fastest) limit and the constant 'MAX_POLL_TIME'
for the higher (slowest) limit.
Whenever a packet arrives, we switch to fastest response by setting
the polling time to its lowest limit. If the following poll fails,
because no packets have arrived, we increase the time for the next
poll. When the net activity is low, the polling time effectively
stays at its maximum value, resulting in the lowest load for the
machine.
*/
#define MAX_POLL_TIME 10
static char version[] =
"bionet.c:v1.0 06-feb-96 (c) Hartmut Laue.\n";
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <asm/setup.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/atarihw.h>
#include <asm/atariints.h>
#include <asm/atari_acsi.h>
#include <asm/atari_stdma.h>
/* use 0 for production, 1 for verification, >2 for debug
*/
#ifndef NET_DEBUG
#define NET_DEBUG 0
#endif
/*
* Global variable 'bionet_debug'. Can be set at load time by 'insmod'
*/
unsigned int bionet_debug = NET_DEBUG;
module_param(bionet_debug, int, 0);
MODULE_PARM_DESC(bionet_debug, "bionet debug level (0-2)");
MODULE_LICENSE("GPL");
static unsigned int bionet_min_poll_time = 2;
/* Information that need to be kept for each board.
*/
struct net_local {
struct net_device_stats stats;
long open_time; /* for debugging */
int poll_time; /* polling time varies with net load */
};
static struct nic_pkt_s { /* packet format */
unsigned char status;
unsigned char dummy;
unsigned char l_lo, l_hi;
unsigned char buffer[3000];
} *nic_packet;
unsigned char *phys_nic_packet;
/* Index to functions, as function prototypes.
*/
static int bionet_open(struct net_device *dev);
static int bionet_send_packet(struct sk_buff *skb, struct net_device *dev);
static void bionet_poll_rx(struct net_device *);
static int bionet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void bionet_tick(unsigned long);
static DEFINE_TIMER(bionet_timer, bionet_tick, 0, 0);
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
/* The following routines access the ethernet board connected to the
* ACSI port via the st_dma chip.
*/
#define NODE_ADR 0x60
#define C_READ 8
#define C_WRITE 0x0a
#define C_GETEA 0x0f
#define C_SETCR 0x0e
static int
sendcmd(unsigned int a0, unsigned int mod, unsigned int cmd) {
unsigned int c;
dma_wd.dma_mode_status = (mod | ((a0) ? 2 : 0) | 0x88);
dma_wd.fdc_acces_seccount = cmd;
dma_wd.dma_mode_status = (mod | 0x8a);
if( !acsi_wait_for_IRQ(HZ/2) ) /* wait for cmd ack */
return -1; /* timeout */
c = dma_wd.fdc_acces_seccount;
return (c & 0xff);
}
static void
set_status(int cr) {
sendcmd(0,0x100,NODE_ADR | C_SETCR); /* CMD: SET CR */
sendcmd(1,0x100,cr);
dma_wd.dma_mode_status = 0x80;
}
static int
get_status(unsigned char *adr) {
int i,c;
DISABLE_IRQ();
c = sendcmd(0,0x00,NODE_ADR | C_GETEA); /* CMD: GET ETH ADR*/
if( c < 0 ) goto gsend;
/* now read status bytes */
for (i=0; i<6; i++) {
dma_wd.fdc_acces_seccount = 0; /* request next byte */
if( !acsi_wait_for_IRQ(HZ/2) ) { /* wait for cmd ack */
c = -1;
goto gsend; /* timeout */
}
c = dma_wd.fdc_acces_seccount;
*adr++ = (unsigned char)c;
}
c = 1;
gsend:
dma_wd.dma_mode_status = 0x80;
return c;
}
static irqreturn_t
bionet_intr(int irq, void *data) {
return IRQ_HANDLED;
}
static int
get_frame(unsigned long paddr, int odd) {
int c;
unsigned long flags;
DISABLE_IRQ();
local_irq_save(flags);
dma_wd.dma_mode_status = 0x9a;
dma_wd.dma_mode_status = 0x19a;
dma_wd.dma_mode_status = 0x9a;
dma_wd.fdc_acces_seccount = 0x04; /* sector count (was 5) */
dma_wd.dma_lo = (unsigned char)paddr;
paddr >>= 8;
dma_wd.dma_md = (unsigned char)paddr;
paddr >>= 8;
dma_wd.dma_hi = (unsigned char)paddr;
local_irq_restore(flags);
c = sendcmd(0,0x00,NODE_ADR | C_READ); /* CMD: READ */
if( c < 128 ) goto rend;
/* now read block */
c = sendcmd(1,0x00,odd); /* odd flag for address shift */
dma_wd.dma_mode_status = 0x0a;
if( !acsi_wait_for_IRQ(100) ) { /* wait for DMA to complete */
c = -1;
goto rend;
}
dma_wd.dma_mode_status = 0x8a;
dma_wd.dma_mode_status = 0x18a;
dma_wd.dma_mode_status = 0x8a;
c = dma_wd.fdc_acces_seccount;
dma_wd.dma_mode_status = 0x88;
c = dma_wd.fdc_acces_seccount;
c = 1;
rend:
dma_wd.dma_mode_status = 0x80;
udelay(40);
acsi_wait_for_noIRQ(20);
return c;
}
static int
hardware_send_packet(unsigned long paddr, int cnt) {
unsigned int c;
unsigned long flags;
DISABLE_IRQ();
local_irq_save(flags);
dma_wd.dma_mode_status = 0x19a;
dma_wd.dma_mode_status = 0x9a;
dma_wd.dma_mode_status = 0x19a;
dma_wd.dma_lo = (unsigned char)paddr;
paddr >>= 8;
dma_wd.dma_md = (unsigned char)paddr;
paddr >>= 8;
dma_wd.dma_hi = (unsigned char)paddr;
dma_wd.fdc_acces_seccount = 0x4; /* sector count */
local_irq_restore(flags);
c = sendcmd(0,0x100,NODE_ADR | C_WRITE); /* CMD: WRITE */
c = sendcmd(1,0x100,cnt&0xff);
c = sendcmd(1,0x100,cnt>>8);
/* now write block */
dma_wd.dma_mode_status = 0x10a; /* DMA enable */
if( !acsi_wait_for_IRQ(100) ) /* wait for DMA to complete */
goto end;
dma_wd.dma_mode_status = 0x19a; /* DMA disable ! */
c = dma_wd.fdc_acces_seccount;
end:
c = sendcmd(1,0x100,0);
c = sendcmd(1,0x100,0);
dma_wd.dma_mode_status = 0x180;
udelay(40);
acsi_wait_for_noIRQ(20);
return( c & 0x02);
}
/* Check for a network adaptor of this type, and return '0' if one exists.
*/
struct net_device * __init bionet_probe(int unit)
{
struct net_device *dev;
unsigned char station_addr[6];
static unsigned version_printed;
static int no_more_found; /* avoid "Probing for..." printed 4 times */
int i;
int err;
if (!MACH_IS_ATARI || no_more_found)
return ERR_PTR(-ENODEV);
dev = alloc_etherdev(sizeof(struct net_local));
if (!dev)
return ERR_PTR(-ENOMEM);
if (unit >= 0) {
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
SET_MODULE_OWNER(dev);
printk("Probing for BioNet 100 Adapter...\n");
stdma_lock(bionet_intr, NULL);
i = get_status(station_addr); /* Read the station address PROM. */
ENABLE_IRQ();
stdma_release();
/* Check the first three octets of the S.A. for the manufactor's code.
*/
if( i < 0
|| station_addr[0] != 'B'
|| station_addr[1] != 'I'
|| station_addr[2] != 'O' ) {
no_more_found = 1;
printk( "No BioNet 100 found.\n" );
free_netdev(dev);
return ERR_PTR(-ENODEV);
}
if (bionet_debug > 0 && version_printed++ == 0)
printk(version);
printk("%s: %s found, eth-addr: %02x-%02x-%02x:%02x-%02x-%02x.\n",
dev->name, "BioNet 100",
station_addr[0], station_addr[1], station_addr[2],
station_addr[3], station_addr[4], station_addr[5]);
/* Initialize the device structure. */
nic_packet = (struct nic_pkt_s *)acsi_buffer;
phys_nic_packet = (unsigned char *)phys_acsi_buffer;
if (bionet_debug > 0) {
printk("nic_packet at 0x%p, phys at 0x%p\n",
nic_packet, phys_nic_packet );
}
dev->open = bionet_open;
dev->stop = bionet_close;
dev->hard_start_xmit = bionet_send_packet;
dev->get_stats = net_get_stats;
/* Fill in the fields of the device structure with ethernet-generic
* values. This should be in a common file instead of per-driver.
*/
for (i = 0; i < ETH_ALEN; i++) {
#if 0
dev->broadcast[i] = 0xff;
#endif
dev->dev_addr[i] = station_addr[i];
}
err = register_netdev(dev);
if (!err)
return dev;
free_netdev(dev);
return ERR_PTR(err);
}
/* Open/initialize the board. This is called (in the current kernel)
sometime after booting when the 'ifconfig' program is run.
This routine should set everything up anew at each open, even
registers that "should" only need to be set once at boot, so that
there is non-reboot way to recover if something goes wrong.
*/
static int
bionet_open(struct net_device *dev) {
struct net_local *lp = netdev_priv(dev);
if (bionet_debug > 0)
printk("bionet_open\n");
stdma_lock(bionet_intr, NULL);
/* Reset the hardware here.
*/
set_status(4);
lp->open_time = 0; /*jiffies*/
lp->poll_time = MAX_POLL_TIME;
dev->tbusy = 0;
dev->interrupt = 0;
dev->start = 1;
stdma_release();
bionet_timer.data = (long)dev;
bionet_timer.expires = jiffies + lp->poll_time;
add_timer(&bionet_timer);
return 0;
}
static int
bionet_send_packet(struct sk_buff *skb, struct net_device *dev) {
struct net_local *lp = netdev_priv(dev);
unsigned long flags;
/* Block a timer-based transmit from overlapping. This could better be
* done with atomic_swap(1, dev->tbusy), but set_bit() works as well.
*/
local_irq_save(flags);
if (stdma_islocked()) {
local_irq_restore(flags);
lp->stats.tx_errors++;
}
else {
int length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
unsigned long buf = virt_to_phys(skb->data);
int stat;
stdma_lock(bionet_intr, NULL);
local_irq_restore(flags);
if( !STRAM_ADDR(buf+length-1) ) {
skb_copy_from_linear_data(skb, nic_packet->buffer,
length);
buf = (unsigned long)&((struct nic_pkt_s *)phys_nic_packet)->buffer;
}
if (bionet_debug >1) {
u_char *data = nic_packet->buffer, *p;
int i;
printk( "%s: TX pkt type 0x%4x from ", dev->name,
((u_short *)data)[6]);
for( p = &data[6], i = 0; i < 6; i++ )
printk("%02x%s", *p++,i != 5 ? ":" : "" );
printk(" to ");
for( p = data, i = 0; i < 6; i++ )
printk("%02x%s", *p++,i != 5 ? ":" : "" "\n" );
printk( "%s: ", dev->name );
printk(" data %02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x"
" %02x%02x%02x%02x len %d\n",
data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19],
data[20], data[21], data[22], data[23], data[24], data[25], data[26], data[27],
data[28], data[29], data[30], data[31], data[32], data[33],
length );
}
dma_cache_maintenance(buf, length, 1);
stat = hardware_send_packet(buf, length);
ENABLE_IRQ();
stdma_release();
dev->trans_start = jiffies;
dev->tbusy = 0;
lp->stats.tx_packets++;
lp->stats.tx_bytes+=length;
}
dev_kfree_skb(skb);
return 0;
}
/* We have a good packet(s), get it/them out of the buffers.
*/
static void
bionet_poll_rx(struct net_device *dev) {
struct net_local *lp = netdev_priv(dev);
int boguscount = 10;
int pkt_len, status;
unsigned long flags;
local_irq_save(flags);
/* ++roman: Take care at locking the ST-DMA... This must be done with ints
* off, since otherwise an int could slip in between the question and the
* locking itself, and then we'd go to sleep... And locking itself is
* necessary to keep the floppy_change timer from working with ST-DMA
* registers. */
if (stdma_islocked()) {
local_irq_restore(flags);
return;
}
stdma_lock(bionet_intr, NULL);
DISABLE_IRQ();
local_irq_restore(flags);
if( lp->poll_time < MAX_POLL_TIME ) lp->poll_time++;
while(boguscount--) {
status = get_frame((unsigned long)phys_nic_packet, 0);
if( status == 0 ) break;
/* Good packet... */
dma_cache_maintenance((unsigned long)phys_nic_packet, 1520, 0);
pkt_len = (nic_packet->l_hi << 8) | nic_packet->l_lo;
lp->poll_time = bionet_min_poll_time; /* fast poll */
if( pkt_len >= 60 && pkt_len <= 1520 ) {
/* ^^^^ war 1514 KHL */
/* Malloc up new buffer.
*/
struct sk_buff *skb = dev_alloc_skb( pkt_len + 2 );
if (skb == NULL) {
printk("%s: Memory squeeze, dropping packet.\n",
dev->name);
lp->stats.rx_dropped++;
break;
}
skb_reserve( skb, 2 ); /* 16 Byte align */
skb_put( skb, pkt_len ); /* make room */
/* 'skb->data' points to the start of sk_buff data area.
*/
skb_copy_to_linear_data(skb, nic_packet->buffer,
pkt_len);
skb->protocol = eth_type_trans( skb, dev );
netif_rx(skb);
dev->last_rx = jiffies;
lp->stats.rx_packets++;
lp->stats.rx_bytes+=pkt_len;
/* If any worth-while packets have been received, dev_rint()
has done a mark_bh(INET_BH) for us and will work on them
when we get to the bottom-half routine.
*/
if (bionet_debug >1) {
u_char *data = nic_packet->buffer, *p;
int i;
printk( "%s: RX pkt type 0x%4x from ", dev->name,
((u_short *)data)[6]);
for( p = &data[6], i = 0; i < 6; i++ )
printk("%02x%s", *p++,i != 5 ? ":" : "" );
printk(" to ");
for( p = data, i = 0; i < 6; i++ )
printk("%02x%s", *p++,i != 5 ? ":" : "" "\n" );
printk( "%s: ", dev->name );
printk(" data %02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x"
" %02x%02x%02x%02x len %d\n",
data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19],
data[20], data[21], data[22], data[23], data[24], data[25], data[26], data[27],
data[28], data[29], data[30], data[31], data[32], data[33],
pkt_len );
}
}
else {
printk(" Packet has wrong length: %04d bytes\n", pkt_len);
lp->stats.rx_errors++;
}
}
stdma_release();
ENABLE_IRQ();
return;
}
/* bionet_tick: called by bionet_timer. Reads packets from the adapter,
* passes them to the higher layers and restarts the timer.
*/
static void
bionet_tick(unsigned long data) {
struct net_device *dev = (struct net_device *)data;
struct net_local *lp = netdev_priv(dev);
if( bionet_debug > 0 && (lp->open_time++ & 7) == 8 )
printk("bionet_tick: %ld\n", lp->open_time);
if( !stdma_islocked() ) bionet_poll_rx(dev);
bionet_timer.expires = jiffies + lp->poll_time;
add_timer(&bionet_timer);
}
/* The inverse routine to bionet_open().
*/
static int
bionet_close(struct net_device *dev) {
struct net_local *lp = netdev_priv(dev);
if (bionet_debug > 0)
printk("bionet_close, open_time=%ld\n", lp->open_time);
del_timer(&bionet_timer);
stdma_lock(bionet_intr, NULL);
set_status(0);
lp->open_time = 0;
dev->tbusy = 1;
dev->start = 0;
stdma_release();
return 0;
}
/* Get the current statistics.
This may be called with the card open or closed.
*/
static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
}
#ifdef MODULE
static struct net_device *bio_dev;
int init_module(void)
{
bio_dev = bionet_probe(-1);
if (IS_ERR(bio_dev))
return PTR_ERR(bio_dev);
return 0;
}
void cleanup_module(void)
{
unregister_netdev(bio_dev);
free_netdev(bio_dev);
}
#endif /* MODULE */
/* Local variables:
* compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include
-b m68k-linuxaout -Wall -Wstrict-prototypes -O2
-fomit-frame-pointer -pipe -DMODULE -I../../net/inet -c bionet.c"
* version-control: t
* kept-new-versions: 5
* tab-width: 8
* End:
*/

878
drivers/net/atari_pamsnet.c
View File

@ -1,878 +0,0 @@
/* atari_pamsnet.c PAMsNet device driver for linux68k.
*
* Version: @(#)PAMsNet.c 0.2ß 03/31/96
*
* Author: Torsten Lang <Torsten.Lang@ap.physik.uni-giessen.de>
* <Torsten.Lang@jung.de>
*
* This driver is based on my driver PAMSDMA.c for MiNT-Net and
* on the driver bionet.c written by
* Hartmut Laue <laue@ifk-mp.uni-kiel.de>
* and Torsten Narjes <narjes@ifk-mp.uni-kiel.de>
*
* Little adaptions for integration into pl7 by Roman Hodek
*
What is it ?
------------
This driver controls the PAMsNet LAN-Adapter which connects
an ATARI ST/TT via the ACSI-port to an Ethernet-based network.
This version can be compiled as a loadable module (See the
compile command at the bottom of this file).
At load time, you can optionally set the debugging level and the
fastest response time on the command line of 'insmod'.
'pamsnet_debug'
controls the amount of diagnostic messages:
0 : no messages
>0 : see code for meaning of printed messages
'pamsnet_min_poll_time' (always >=1)
gives the time (in jiffies) between polls. Low values
increase the system load (beware!)
When loaded, a net device with the name 'eth?' becomes available,
which can be controlled with the usual 'ifconfig' command.
It is possible to compile this driver into the kernel like other
(net) drivers. For this purpose, some source files (e.g. config-files
makefiles, Space.c) must be changed accordingly. (You may refer to
other drivers how to do it.) In this case, the device will be detected
at boot time and (probably) appear as 'eth0'.
Theory of Operation
-------------------
Because the ATARI DMA port is usually shared between several
devices (eg. harddisk, floppy) we cannot block the ACSI bus
while waiting for interrupts. Therefore we use a polling mechanism
to fetch packets from the adapter. For the same reason, we send
packets without checking that the previous packet has been sent to
the LAN. We rely on the higher levels of the networking code to detect
missing packets and resend them.
Before we access the ATARI DMA controller, we check if another
process is using the DMA. If not, we lock the DMA, perform one or
more packet transfers and unlock the DMA before returning.
We do not use 'stdma_lock' unconditionally because it is unclear
if the networking code can be set to sleep, which will happen if
another (possibly slow) device is using the DMA controller.
The polling is done via timer interrupts which periodically
'simulate' an interrupt from the Ethernet adapter. The time (in jiffies)
between polls varies depending on an estimate of the net activity.
The allowed range is given by the variable 'bionet_min_poll_time'
for the lower (fastest) limit and the constant 'MAX_POLL_TIME'
for the higher (slowest) limit.
Whenever a packet arrives, we switch to fastest response by setting
the polling time to its lowest limit. If the following poll fails,
because no packets have arrived, we increase the time for the next
poll. When the net activity is low, the polling time effectively
stays at its maximum value, resulting in the lowest load for the
machine.
*/
#define MAX_POLL_TIME 10
static char *version =
"pamsnet.c:v0.2beta 30-mar-96 (c) Torsten Lang.\n";
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/errno.h>
#include <asm/atarihw.h>
#include <asm/atariints.h>
#include <asm/atari_stdma.h>
#include <asm/atari_acsi.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#undef READ
#undef WRITE
/* use 0 for production, 1 for verification, >2 for debug
*/
#ifndef NET_DEBUG
#define NET_DEBUG 0
#endif
/*
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
module_param(pamsnet_debug, int, 0);
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
static unsigned int pamsnet_min_poll_time = 2;
/* Information that need to be kept for each board.
*/
struct net_local {
struct net_device_stats stats;
long open_time; /* for debugging */
int poll_time; /* polling time varies with net load */
};
static struct nic_pkt_s { /* packet format */
unsigned char buffer[2048];
} *nic_packet = 0;
unsigned char *phys_nic_packet;
typedef unsigned char HADDR[6]; /* 6-byte hardware address of lance */
/* Index to functions, as function prototypes.
*/
static void start (int target);
static int stop (int target);
static int testpkt (int target);
static int sendpkt (int target, unsigned char *buffer, int length);
static int receivepkt (int target, unsigned char *buffer);
static int inquiry (int target, unsigned char *buffer);
static HADDR *read_hw_addr(int target, unsigned char *buffer);
static void setup_dma (void *address, unsigned rw_flag, int num_blocks);
static int send_first (int target, unsigned char byte);
static int send_1_5 (int lun, unsigned char *command, int dma);
static int get_status (void);
static int calc_received (void *start_address);
static int pamsnet_open(struct net_device *dev);
static int pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev);
static void pamsnet_poll_rx(struct net_device *);
static int pamsnet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
static irqreturn_t pamsnet_intr(int irq, void *data);
static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
typedef struct
{
unsigned char reserved1[0x38];
HADDR hwaddr;
unsigned char reserved2[0x1c2];
} DMAHWADDR;
/*
* Definitions of commands understood by the PAMs DMA adaptor.
*
* In general the DMA adaptor uses LUN 0, 5, 6 and 7 on one ID changeable
* by the PAM's Net software.
*
* LUN 0 works as a harddisk. You can boot the PAM's Net driver there.
* LUN 5 works as a harddisk and lets you access the RAM and some I/O HW
* area. In sector 0, bytes 0x38-0x3d you find the ethernet HW address
* of the adaptor.
* LUN 6 works as a harddisk and lets you access the firmware ROM.
* LUN 7 lets you send and receive packets.
*
* Some commands like the INQUIRY command work identical on all used LUNs.
*
* UNKNOWN1 seems to read some data.
* Command length is 6 bytes.
* UNKNOWN2 seems to read some data (command byte 1 must be !=0). The
* following bytes seem to be something like an allocation length.
* Command length is 6 bytes.
* READPKT reads a packet received by the DMA adaptor.
* Command length is 6 bytes.
* WRITEPKT sends a packet transferred by the following DMA phase. The length
* of the packet is transferred in command bytes 3 and 4.
* The adaptor automatically replaces the src hw address in an ethernet
* packet by its own hw address.
* Command length is 6 bytes.
* INQUIRY has the same function as the INQUIRY command supported by harddisks
* and other SCSI devices. It lets you detect which device you found
* at a given address.
* Command length is 6 bytes.
* START initializes the DMA adaptor. After this command it is able to send
* and receive packets. There is no status byte returned!
* Command length is 1 byte.
* NUMPKTS gives back the number of received packets waiting in the queue in
* the status byte.
* Command length is 1 byte.
* UNKNOWN3
* UNKNOWN4 Function of these three commands is unknown.
* UNKNOWN5 The command length of these three commands is 1 byte.
* DESELECT immediately deselects the DMA adaptor. May important with interrupt
* driven operation.
* Command length is 1 byte.
* STOP resets the DMA adaptor. After this command packets can no longer
* be received or transferred.
* Command length is 6 byte.
*/
enum {UNKNOWN1=3, READPKT=8, UNKNOWN2, WRITEPKT=10, INQUIRY=18, START,
NUMPKTS=22, UNKNOWN3, UNKNOWN4, UNKNOWN5, DESELECT, STOP};
#define READSECTOR READPKT
#define WRITESECTOR WRITEPKT
u_char *inquire8="MV PAM's NET/GK";
#define DMALOW dma_wd.dma_lo
#define DMAMID dma_wd.dma_md
#define DMAHIGH dma_wd.dma_hi
#define DACCESS dma_wd.fdc_acces_seccount
#define MFP_GPIP mfp.par_dt_reg
/* Some useful functions */
#define INT (!(MFP_GPIP & 0x20))
#define DELAY ({MFP_GPIP; MFP_GPIP; MFP_GPIP;})
#define WRITEMODE(value) \
({ u_short dummy = value; \
__asm__ volatile("movew %0, 0xFFFF8606" : : "d"(dummy)); \
DELAY; \
})
#define WRITEBOTH(value1, value2) \
({ u_long dummy = (u_long)(value1)<<16 | (u_short)(value2); \
__asm__ volatile("movel %0, 0xFFFF8604" : : "d"(dummy)); \
DELAY; \
})
/* Definitions for DMODE */
#define READ 0x000
#define WRITE 0x100
#define DMA_FDC 0x080
#define DMA_ACSI 0x000
#define DMA_DISABLE 0x040
#define SEC_COUNT 0x010
#define DMA_WINDOW 0x000
#define REG_ACSI 0x008
#define REG_FDC 0x000
#define A1 0x002
/* Timeout constants */
#define TIMEOUTCMD HZ/2 /* ca. 500ms */
#define TIMEOUTDMA HZ /* ca. 1s */
#define COMMAND_DELAY 500 /* ca. 0.5ms */
unsigned rw;
int lance_target = -1;
int if_up = 0;
/* The following routines access the ethernet board connected to the
* ACSI port via the st_dma chip.
*/
/* The following lowlevel routines work on physical addresses only and assume
* that eventually needed buffers are
* - completely located in ST RAM
* - are contigous in the physical address space
*/
/* Setup the DMA counter */
static void
setup_dma (void *address, unsigned rw_flag, int num_blocks)
{
WRITEMODE((unsigned) rw_flag | DMA_FDC | SEC_COUNT | REG_ACSI |
A1);
WRITEMODE((unsigned)(rw_flag ^ WRITE) | DMA_FDC | SEC_COUNT | REG_ACSI |
A1);
WRITEMODE((unsigned) rw_flag | DMA_FDC | SEC_COUNT | REG_ACSI |
A1);
DMALOW = (unsigned char)((unsigned long)address & 0xFF);
DMAMID = (unsigned char)(((unsigned long)address >> 8) & 0xFF);
DMAHIGH = (unsigned char)(((unsigned long)address >> 16) & 0xFF);
WRITEBOTH((unsigned)num_blocks & 0xFF,
rw_flag | DMA_FDC | DMA_WINDOW | REG_ACSI | A1);
rw = rw_flag;
}
/* Send the first byte of an command block */
static int
send_first (int target, unsigned char byte)
{
rw = READ;
acsi_delay_end(COMMAND_DELAY);
/*
* wake up ACSI
*/
WRITEMODE(DMA_FDC | DMA_WINDOW | REG_ACSI);
/*
* write command byte
*/
WRITEBOTH((target << 5) | (byte & 0x1F), DMA_FDC |
DMA_WINDOW | REG_ACSI | A1);
return (!acsi_wait_for_IRQ(TIMEOUTCMD));
}
/* Send the rest of an command block */
static int
send_1_5 (int lun, unsigned char *command, int dma)
{
int i, j;
for (i=0; i<5; i++) {
WRITEBOTH((!i ? (((lun & 0x7) << 5) | (command[i] & 0x1F))
: command[i]),
rw | REG_ACSI | DMA_WINDOW |
((i < 4) ? DMA_FDC
: (dma ? DMA_ACSI
: DMA_FDC)) | A1);
if (i < 4 && (j = !acsi_wait_for_IRQ(TIMEOUTCMD)))
return (j);
}
return (0);
}
/* Read a status byte */
static int
get_status (void)
{
WRITEMODE(DMA_FDC | DMA_WINDOW | REG_ACSI | A1);
acsi_delay_start();
return ((int)(DACCESS & 0xFF));
}
/* Calculate the number of received bytes */
static int
calc_received (void *start_address)
{
return (int)(
(((unsigned long)DMAHIGH << 16) | ((unsigned)DMAMID << 8) | DMALOW)
- (unsigned long)start_address);
}
/* The following midlevel routines still work on physical addresses ... */
/* start() starts the PAM's DMA adaptor */
static void
start (int target)
{
send_first(target, START);
}
/* stop() stops the PAM's DMA adaptor and returns a value of zero in case of success */
static int
stop (int target)
{
int ret = -1;
unsigned char cmd_buffer[5];
if (send_first(target, STOP))
goto bad;
cmd_buffer[0] = cmd_buffer[1] = cmd_buffer[2] =
cmd_buffer[3] = cmd_buffer[4] = 0;
if (send_1_5(7, cmd_buffer, 0) ||
!acsi_wait_for_IRQ(TIMEOUTDMA) ||
get_status())
goto bad;
ret = 0;
bad:
return (ret);
}
/* testpkt() returns the number of received packets waiting in the queue */
static int
testpkt(int target)
{
int ret = -1;
if (send_first(target, NUMPKTS))
goto bad;
ret = get_status();
bad:
return (ret);
}
/* inquiry() returns 0 when PAM's DMA found, -1 when timeout, -2 otherwise */
/* Please note: The buffer is for internal use only but must be defined! */
static int
inquiry (int target, unsigned char *buffer)
{
int ret = -1;
unsigned char *vbuffer = phys_to_virt((unsigned long)buffer);
unsigned char cmd_buffer[5];
if (send_first(target, INQUIRY))
goto bad;
setup_dma(buffer, READ, 1);
vbuffer[8] = vbuffer[27] = 0; /* Avoid confusion with previous read data */
cmd_buffer[0] = cmd_buffer[1] = cmd_buffer[2] = cmd_buffer[4] = 0;
cmd_buffer[3] = 48;
if (send_1_5(5, cmd_buffer, 1) ||
!acsi_wait_for_IRQ(TIMEOUTDMA) ||
get_status() ||
(calc_received(buffer) < 32))
goto bad;
dma_cache_maintenance((unsigned long)(buffer+8), 20, 0);
if (memcmp(inquire8, vbuffer+8, 20))
goto bad;
ret = 0;
bad:
if (!!NET_DEBUG) {
vbuffer[8+20]=0;
printk("inquiry of target %d: %s\n", target, vbuffer+8);
}
return (ret);
}
/*
* read_hw_addr() reads the sector containing the hwaddr and returns
* a pointer to it (virtual address!) or 0 in case of an error
*/
static HADDR
*read_hw_addr(int target, unsigned char *buffer)
{
HADDR *ret = 0;
unsigned char cmd_buffer[5];
if (send_first(target, READSECTOR))
goto bad;
setup_dma(buffer, READ, 1);
cmd_buffer[0] = cmd_buffer[1] = cmd_buffer[2] = cmd_buffer[4] = 0;
cmd_buffer[3] = 1;
if (send_1_5(5, cmd_buffer, 1) ||
!acsi_wait_for_IRQ(TIMEOUTDMA) ||
get_status())
goto bad;
ret = phys_to_virt((unsigned long)&(((DMAHWADDR *)buffer)->hwaddr));
dma_cache_maintenance((unsigned long)buffer, 512, 0);
bad:
return (ret);
}
static irqreturn_t
pamsnet_intr(int irq, void *data)
{
return IRQ_HANDLED;
}
/* receivepkt() loads a packet to a given buffer and returns its length */
static int
receivepkt (int target, unsigned char *buffer)
{
int ret = -1;
unsigned char cmd_buffer[5];
if (send_first(target, READPKT))
goto bad;
setup_dma(buffer, READ, 3);
cmd_buffer[0] = cmd_buffer[1] = cmd_buffer[2] = cmd_buffer[4] = 0;
cmd_buffer[3] = 3;
if (send_1_5(7, cmd_buffer, 1) ||
!acsi_wait_for_IRQ(TIMEOUTDMA) ||
get_status())
goto bad;
ret = calc_received(buffer);
bad:
return (ret);
}
/* sendpkt() sends a packet and returns a value of zero when the packet was sent
successfully */
static int
sendpkt (int target, unsigned char *buffer, int length)
{
int ret = -1;
unsigned char cmd_buffer[5];
if (send_first(target, WRITEPKT))
goto bad;
setup_dma(buffer, WRITE, 3);
cmd_buffer[0] = cmd_buffer[1] = cmd_buffer[4] = 0;
cmd_buffer[2] = length >> 8;
cmd_buffer[3] = length & 0xFF;
if (send_1_5(7, cmd_buffer, 1) ||
!acsi_wait_for_IRQ(TIMEOUTDMA) ||
get_status())
goto bad;
ret = 0;
bad:
return (ret);
}
/* The following higher level routines work on virtual addresses and convert them to
* physical addresses when passed to the lowlevel routines. It's up to the higher level
* routines to copy data from Alternate RAM to ST RAM if neccesary!
*/
/* Check for a network adaptor of this type, and return '0' if one exists.
*/
struct net_device * __init pamsnet_probe (int unit)
{
struct net_device *dev;
int i;
HADDR *hwaddr;
int err;
unsigned char station_addr[6];
static unsigned version_printed;
/* avoid "Probing for..." printed 4 times - the driver is supporting only one adapter now! */
static int no_more_found;
if (no_more_found)
return ERR_PTR(-ENODEV);
no_more_found = 1;
dev = alloc_etherdev(sizeof(struct net_local));
if (!dev)
return ERR_PTR(-ENOMEM);
if (unit >= 0) {
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
SET_MODULE_OWNER(dev);
printk("Probing for PAM's Net/GK Adapter...\n");
/* Allocate the DMA buffer here since we need it for probing! */
nic_packet = (struct nic_pkt_s *)acsi_buffer;
phys_nic_packet = (unsigned char *)phys_acsi_buffer;
if (pamsnet_debug > 0) {
printk("nic_packet at 0x%p, phys at 0x%p\n",
nic_packet, phys_nic_packet );
}
stdma_lock(pamsnet_intr, NULL);
DISABLE_IRQ();
for (i=0; i<8; i++) {
/* Do two inquiries to cover cases with strange equipment on previous ID */
/* blocking the ACSI bus (like the SLMC804 laser printer controller... */
inquiry(i, phys_nic_packet);
if (!inquiry(i, phys_nic_packet)) {
lance_target = i;
break;
}
}
if (!!NET_DEBUG)
printk("ID: %d\n",i);
if (lance_target >= 0) {
if (!(hwaddr = read_hw_addr(lance_target, phys_nic_packet)))
lance_target = -1;
else
memcpy (station_addr, hwaddr, ETH_ALEN);
}
ENABLE_IRQ();
stdma_release();
if (lance_target < 0) {
printk("No PAM's Net/GK found.\n");
free_netdev(dev);
return ERR_PTR(-ENODEV);
}
if (pamsnet_debug > 0 && version_printed++ == 0)
printk(version);
printk("%s: %s found on target %01d, eth-addr: %02x:%02x:%02x:%02x:%02x:%02x.\n",
dev->name, "PAM's Net/GK", lance_target,
station_addr[0], station_addr[1], station_addr[2],
station_addr[3], station_addr[4], station_addr[5]);
/* Initialize the device structure. */
dev->open = pamsnet_open;
dev->stop = pamsnet_close;
dev->hard_start_xmit = pamsnet_send_packet;
dev->get_stats = net_get_stats;
/* Fill in the fields of the device structure with ethernet-generic
* values. This should be in a common file instead of per-driver.
*/
for (i = 0; i < ETH_ALEN; i++) {
#if 0
dev->broadcast[i] = 0xff;
#endif
dev->dev_addr[i] = station_addr[i];
}
err = register_netdev(dev);
if (!err)
return dev;
free_netdev(dev);
return ERR_PTR(err);
}
/* Open/initialize the board. This is called (in the current kernel)
sometime after booting when the 'ifconfig' program is run.
This routine should set everything up anew at each open, even
registers that "should" only need to be set once at boot, so that
there is non-reboot way to recover if something goes wrong.
*/
static int
pamsnet_open(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
if (pamsnet_debug > 0)
printk("pamsnet_open\n");
stdma_lock(pamsnet_intr, NULL);
DISABLE_IRQ();
/* Reset the hardware here.
*/
if (!if_up)
start(lance_target);
if_up = 1;
lp->open_time = 0; /*jiffies*/
lp->poll_time = MAX_POLL_TIME;
dev->tbusy = 0;
dev->interrupt = 0;
dev->start = 1;
ENABLE_IRQ();
stdma_release();
pamsnet_timer.data = (long)dev;
pamsnet_timer.expires = jiffies + lp->poll_time;
add_timer(&pamsnet_timer);
return 0;
}
static int
pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
unsigned long flags;
/* Block a timer-based transmit from overlapping. This could better be
* done with atomic_swap(1, dev->tbusy), but set_bit() works as well.
*/
local_irq_save(flags);
if (stdma_islocked()) {
local_irq_restore(flags);
lp->stats.tx_errors++;
}
else {
int length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
unsigned long buf = virt_to_phys(skb->data);
int stat;
stdma_lock(pamsnet_intr, NULL);
DISABLE_IRQ();
local_irq_restore(flags);
if( !STRAM_ADDR(buf+length-1) ) {
skb_copy_from_linear_data(skb, nic_packet->buffer,
length);
buf = (unsigned long)phys_nic_packet;
}
dma_cache_maintenance(buf, length, 1);
stat = sendpkt(lance_target, (unsigned char *)buf, length);
ENABLE_IRQ();
stdma_release();
dev->trans_start = jiffies;
dev->tbusy = 0;
lp->stats.tx_packets++;
lp->stats.tx_bytes+=length;
}
dev_kfree_skb(skb);
return 0;
}
/* We have a good packet(s), get it/them out of the buffers.
*/
static void
pamsnet_poll_rx(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
int boguscount;
int pkt_len;
struct sk_buff *skb;
unsigned long flags;
local_irq_save(flags);
/* ++roman: Take care at locking the ST-DMA... This must be done with ints
* off, since otherwise an int could slip in between the question and the
* locking itself, and then we'd go to sleep... And locking itself is
* necessary to keep the floppy_change timer from working with ST-DMA
* registers. */
if (stdma_islocked()) {
local_irq_restore(flags);
return;
}
stdma_lock(pamsnet_intr, NULL);
DISABLE_IRQ();
local_irq_restore(flags);
boguscount = testpkt(lance_target);
if( lp->poll_time < MAX_POLL_TIME ) lp->poll_time++;
while(boguscount--) {
pkt_len = receivepkt(lance_target, phys_nic_packet);
if( pkt_len < 60 ) break;
/* Good packet... */
dma_cache_maintenance((unsigned long)phys_nic_packet, pkt_len, 0);
lp->poll_time = pamsnet_min_poll_time; /* fast poll */
if( pkt_len >= 60 && pkt_len <= 2048 ) {
if (pkt_len > 1514)
pkt_len = 1514;
/* Malloc up new buffer.
*/
skb = alloc_skb(pkt_len, GFP_ATOMIC);
if (skb == NULL) {
printk("%s: Memory squeeze, dropping packet.\n",
dev->name);
lp->stats.rx_dropped++;
break;
}
skb->len = pkt_len;
skb->dev = dev;
/* 'skb->data' points to the start of sk_buff data area.
*/
skb_copy_to_linear_data(skb, nic_packet->buffer,
pkt_len);
netif_rx(skb);
dev->last_rx = jiffies;
lp->stats.rx_packets++;
lp->stats.rx_bytes+=pkt_len;
}
}
/* If any worth-while packets have been received, dev_rint()
has done a mark_bh(INET_BH) for us and will work on them
when we get to the bottom-half routine.
*/
ENABLE_IRQ();
stdma_release();
return;
}
/* pamsnet_tick: called by pamsnet_timer. Reads packets from the adapter,
* passes them to the higher layers and restarts the timer.
*/
static void
pamsnet_tick(unsigned long data)
{
struct net_device *dev = (struct net_device *)data;
struct net_local *lp = netdev_priv(dev);
if( pamsnet_debug > 0 && (lp->open_time++ & 7) == 8 )
printk("pamsnet_tick: %ld\n", lp->open_time);
pamsnet_poll_rx(dev);
pamsnet_timer.expires = jiffies + lp->poll_time;
add_timer(&pamsnet_timer);
}
/* The inverse routine to pamsnet_open().
*/
static int
pamsnet_close(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
if (pamsnet_debug > 0)
printk("pamsnet_close, open_time=%ld\n", lp->open_time);
del_timer(&pamsnet_timer);
stdma_lock(pamsnet_intr, NULL);
DISABLE_IRQ();
if (if_up)
stop(lance_target);
if_up = 0;
lp->open_time = 0;
dev->tbusy = 1;
dev->start = 0;
ENABLE_IRQ();
stdma_release();
return 0;
}
/* Get the current statistics.
This may be called with the card open or closed.
*/
static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
}
#ifdef MODULE
static struct net_device *pam_dev;
int init_module(void)
{
pam_dev = pamsnet_probe(-1);
if (IS_ERR(pam_dev))
return PTR_ERR(pam_dev);
return 0;
}
void cleanup_module(void)
{
unregister_netdev(pam_dev);
free_netdev(pam_dev);
}
#endif /* MODULE */
/* Local variables:
* compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include
-b m68k-linuxaout -Wall -Wstrict-prototypes -O2
-fomit-frame-pointer -pipe -DMODULE -I../../net/inet -c atari_pamsnet.c"
* version-control: t
* kept-new-versions: 5
* tab-width: 8
* End:
*/

4
fs/splice.c
View File

@ -1061,8 +1061,9 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
while (len) {
size_t read_len;
loff_t pos = sd->pos;
ret = do_splice_to(in, &sd->pos, pipe, len, flags);
ret = do_splice_to(in, &pos, pipe, len, flags);
if (unlikely(ret <= 0))
goto out_release;
@ -1080,6 +1081,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
bytes += ret;
len -= ret;
sd->pos = pos;
if (ret < read_len)
goto out_release;

28
include/asm-m68k/atari_SLM.h
View File

@ -1,28 +0,0 @@
#ifndef _ATARI_SLM_H
#define _ATARI_SLM_H
/* Atari SLM laser printer specific ioctls */
#define SLMIOGSTAT 0xa100
#define SLMIOGPSIZE 0xa101
#define SLMIOGMFEED 0xa102
#define SLMIORESET 0xa140
#define SLMIOSPSIZE 0xa181
#define SLMIOSMFEED 0xa182
/* Status returning structure (SLMIOGSTAT) */
struct SLM_status {
int stat; /* numeric status code */
char str[40]; /* status string */
};
/* Paper size structure (SLMIO[GS]PSIZE) */
struct SLM_paper_size {
int width;
int height;
};
#endif /* _ATARI_SLM_H */

37
include/asm-m68k/atari_acsi.h
View File

@ -1,37 +0,0 @@
#ifndef _ASM_ATARI_ACSI_H
#define _ASM_ATARI_ACSI_H
/* Functions exported by drivers/block/acsi.c */
void acsi_delay_start( void );
void acsi_delay_end( long usec );
int acsi_wait_for_IRQ( unsigned timeout );
int acsi_wait_for_noIRQ( unsigned timeout );
int acsicmd_nodma( const char *cmd, int enable);
int acsi_getstatus( void );
int acsi_extstatus( char *buffer, int cnt );
void acsi_end_extstatus( void );
int acsi_extcmd( unsigned char *buffer, int cnt );
/* The ACSI buffer is guarantueed to reside in ST-RAM and may be used by other
* drivers that work on the ACSI bus, too. It's data are valid only as long as
* the ST-DMA is locked. */
extern char *acsi_buffer;
extern unsigned long phys_acsi_buffer;
/* Utility macros */
/* Send one data byte over the bus and set mode for next operation
* with one move.l -- Atari recommends this...
*/
#define DMA_LONG_WRITE(data,mode) \
do { \
*((unsigned long *)&dma_wd.fdc_acces_seccount) = \
((data)<<16) | (mode); \
} while(0)
#define ENABLE_IRQ() atari_turnon_irq( IRQ_MFP_ACSI )
#define DISABLE_IRQ() atari_turnoff_irq( IRQ_MFP_ACSI )
#endif /* _ASM_ATARI_ACSI_H */