From 25b37ef65f61c74a5971f895c3f1a0fe4233d51b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 23 Nov 2007 15:33:33 -0500 Subject: [PATCH] Import 2.3.99pre3 --- Documentation/devices.tex | 2209 ----------------------------- Documentation/devices.txt | 160 ++- MAINTAINERS | 7 + arch/alpha/config.in | 20 +- arch/alpha/defconfig | 45 +- arch/arm/config.in | 4 + arch/arm/defconfig | 204 ++- arch/ia64/config.in | 53 +- arch/ia64/defconfig | 200 ++- arch/m68k/config.in | 1 + arch/m68k/defconfig | 234 ++- arch/mips/config.in | 19 +- arch/mips/defconfig | 102 +- arch/mips64/config.in | 5 +- arch/mips64/defconfig | 36 +- arch/ppc/config.in | 28 +- arch/ppc/defconfig | 35 +- arch/sh/config.in | 2 + arch/sh/defconfig | 32 +- arch/sparc/config.in | 2 + arch/sparc64/config.in | 4 +- arch/sparc64/defconfig | 4 +- arch/sparc64/kernel/sys_sparc32.c | 4 +- arch/sparc64/lib/memcmp.S | 41 +- drivers/isdn/avmb1/b1pcmcia.c | 1 - drivers/isdn/avmb1/capi.c | 1 + drivers/isdn/avmb1/capifs.c | 3 - drivers/net/via-rhine.c | 229 ++- drivers/usb/uhci.c | 12 +- drivers/usb/usb-ohci.c | 20 +- drivers/usb/usb-storage.c | 324 +++-- drivers/usb/usb-uhci.c | 23 +- drivers/usb/usb.c | 49 + fs/dcache.c | 8 + fs/exec.c | 10 +- fs/nfs/dir.c | 4 +- fs/nfs/nfs2xdr.c | 1 - fs/openpromfs/inode.c | 2 +- include/linux/usb.h | 1 + 39 files changed, 1298 insertions(+), 2841 deletions(-) delete mode 100644 Documentation/devices.tex diff --git a/Documentation/devices.tex b/Documentation/devices.tex deleted file mode 100644 index f3767f5efbff..000000000000 --- a/Documentation/devices.tex +++ /dev/null @@ -1,2209 +0,0 @@ -\documentstyle{article} -% $Id: devices.tex,v 1.14 1998/08/10 22:39:24 hpa Exp $ -% --------------------------------------------------------------------------- -% Adopt somewhat reasonable margins, so it doesn't take a million -% pages to print... :-) If you're actually putting this in print, you -% may wish to change these. -\oddsidemargin=0in -\textwidth=6.5in -\topmargin=0in -\headheight=0.5in -\headsep=0.25in -\textheight=7.5in -\footskip=0.75in -\footheight=0.5in -% -\begin{document} -\newcommand{\file}{\tt} % Style to use for a filename -\newcommand{\url}{\it} % Style to use for an URL -\newcommand{\hex}{\tt} % Style to use for a hex number -\newcommand{\ud}{(Under development)} % Abbreviation -\newcommand{\1}{\({}^1\)} -\newcommand{\2}{\({}^2\)} -\newcommand{\3}{\({}^3\)} -\newcommand{\4}{\({}^4\)} -\newlength{\dig} -\settowidth{\dig}{0} % Get width of digits -\newcommand{\num}[2]{\makebox[#1\dig][r]{#2}} -\newcommand{\major}[4]{\num{3}{#1}#2 \> #3 \> #4 \\} -\newcommand{\minor}[3]{\> \> \num{3}{#1} \> {\file #2} \> #3 \\} -\newcommand{\minordots}{\> \> \> \dots \\} -\newenvironment{devicelist}% - {\begin{tabbing}% -000--000 \= blockxxx \= 000 \= {\file /dev/input/keyboardxxx} \= foo \kill}% - {\end{tabbing}} -\newcommand{\link}[4]{{\file #1} \> {\file #2} \> #3 \> #4 \\} -\newcommand{\vlink}[4]{{\file #1} \> {\em #2 \/} \> #3 \> #4 \\} -\newcommand{\node}[3]{{\file #1} \> #2 \> #3 \\} -\newcommand{\tum}{$''$} -\newenvironment{nodelist}% - {\begin{tabbing}% -{\file /dev/crambamboli} \= {\file /proc/self/fd/99} \= symbolicxxx \= -foo \kill}% - {\end{tabbing}} -% -% If you reformat this document, *please* make sure this information -% gets included! This list changes frequently, so it is crucial to -% know the date of the revision. -% -\title{{\bf Linux Allocated Devices}} -\author{Maintained by H. Peter Anvin $<$hpa@zytor.com$>$} -\date{Last revised: August 10, 1998} -\maketitle -% -\noindent -This list is the Linux Device List, the official registry of allocated -device numbers and {\file /dev} directory nodes for the Linux -operating system. - -The latest version of this list is included with the Linux kernel -sources in \LaTeX\ and ASCII form. It is also available separately -from {\url ftp://ftp.kernel.org/pub/linux/docs/device-list/}. In case -of discrepancy between the text and \LaTeX\ versions, the \LaTeX\ -version is authoritative. - -This document is included by reference into the Linux Filesystem -Standard (FSSTND). The FSSTND is available from -{\url ftp://tsx-11.mit.edu/pub/linux/docs/linux-standards/fsstnd/}. - -Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga -platform only. Allocations marked (68k/Atari) apply to Linux/68k on -the Atari platform only. - -This document is in the public domain. The author requests, however, -that semantically altered versions are not distributed without -permission of the author, assuming the author can be contacted without -an unreasonable effort. - -In particular, please don't sent patches for this list to Linus, at -least not without contacting me first. - -I do not have any information about these devices beyond what appears -on this list. Any such information requests will be deleted without -reply. - -\section{How to submit a device entry} - -To have a major number allocated, or a minor number in situations -where that applies (e.g. busmice), please contact me with the -appropriate device information. Also, if you have additional -information regarding any of the devices listed below, or if I have -made a mistake, I would greatly appreciate a note. - -I do, however, make two requests about the nature of your report. -This is necessary for me to be able to keep this list up to date and -correct in a timely manner. First of all, {\em please\/} include the -word ``device'' in the subject so your mail won't accidentally get -buried! I receive hundreds of email messages a day, so mail sent with -other subjects may very well get lost in the avalanche. - -Second, please include a description of the device {\em in the same -format as this list\/}. The reason for this is that it is the only -way I have found to ensure I have all the requisite information to -publish your device and avoid conflicts. - -Your cooperation is appreciated. - -\section{Major numbers} - -\begin{devicelist} -\major{ 0}{}{ }{Unnamed devices (e.g. non-device mounts)} -\major{ 1}{}{char }{Memory devices} -\major{ }{}{block}{RAM disk} -\major{ 2}{}{char }{Pseudo-TTY masters} -\major{ }{}{block}{Floppy disks} -\major{ 3}{}{char }{Pseudo-TTY slaves} -\major{ }{}{block}{First MFM, RLL or IDE hard disk/CD-ROM interface} -\major{ 4}{}{char }{TTY devices} -\major{ 5}{}{char }{Alternate TTY devices} -\major{ 6}{}{char }{Parallel printer devices} -\major{ 7}{}{char }{Virtual console access devices} -\major{ }{}{block}{Loopback devices} -\major{ 8}{}{block}{SCSI disk devices (0-15)} -\major{ 9}{}{char }{SCSI tape devices} -\major{ }{}{block}{Metadisk (RAID) devices} -\major{10}{}{char }{Non-serial mice, misc features} -\major{11}{}{char }{Raw keyboard device} -\major{ }{}{block}{SCSI CD-ROM devices} -\major{12}{}{char }{QIC-02 tape} -\major{ }{}{block}{MSCDEX CD-ROM callback support} -\major{13}{}{char }{PC speaker} -\major{ }{}{block}{8-bit MFM/RLL/IDE controller} -\major{14}{}{char }{Sound card} -\major{ }{}{block}{BIOS harddrive callback support} -\major{15}{}{char }{Joystick} -\major{ }{}{block}{Sony CDU-31A/CDU-33A CD-ROM} -\major{16}{}{char }{Non-SCSI scanners} -\major{ }{}{block}{GoldStar CD-ROM} -\major{17}{}{char }{Chase serial card} -\major{ }{}{block}{Optics Storage CD-ROM} -\major{18}{}{char }{Chase serial card -- alternate devices} -\major{ }{}{block}{Sanyo CD-ROM} -\major{19}{}{char }{Cyclades serial card} -\major{ }{}{block}{``Double'' compressed disk} -\major{20}{}{char }{Cyclades serial card -- alternate devices} -\major{ }{}{block}{Hitachi CD-ROM} -\major{21}{}{char }{Generic SCSI access} -\major{ }{}{block }{Acorn MFM hard drive interface} -\major{22}{}{char }{Digiboard serial card} -\major{ }{}{block}{Second IDE hard disk/CD-ROM interface} -\major{23}{}{char }{Digiboard serial card -- alternate devices} -\major{ }{}{block}{Mitsumi proprietary CD-ROM} -\major{24}{}{char }{Stallion serial card} -\major{ }{}{block}{Sony CDU-535 CD-ROM} -\major{25}{}{char }{Stallion serial card -- alternate devices} -\major{ }{}{block}{First Matsushita (Panasonic/SoundBlaster) CD-ROM} -\major{26}{}{char }{Quanta WinVision frame grabber} -\major{ }{}{block}{Second Matsushita (Panasonic/SoundBlaster) CD-ROM} -\major{27}{}{char }{QIC-117 tape} -\major{ }{}{block}{Third Matsushita (Panasonic/SoundBlaster) CD-ROM} -\major{28}{}{char }{Stallion serial card -- card programming} -\major{ }{}{char }{Atari SLM ACSI laser printer (68k/Atari)} -\major{ }{}{block}{Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM} -\major{ }{}{block}{ACSI disk/CD-ROM (68k/Atari)} -\major{29}{}{char }{Universal frame buffer} -\major{ }{}{block}{Aztech/Orchid/Okano/Wearnes CD-ROM} -\major{30}{}{char }{iBCS-2 compatibility devices} -\major{ }{}{block}{Philips LMS CM-205 CD-ROM} -\major{31}{}{char }{MPU-401 MIDI} -\major{ }{}{block}{ROM/flash memory card} -\major{32}{}{char }{Specialix serial card} -\major{ }{}{block}{Philips LMS CM-206 CD-ROM} -\major{33}{}{char }{Specialix serial card -- alternate devices} -\major{ }{}{block}{Third IDE hard disk/CD-ROM interface} -\major{34}{}{char }{Z8530 HDLC driver} -\major{ }{}{block}{Fourth IDE hard disk/CD-ROM interface} -\major{35}{}{char }{tclmidi MIDI driver} -\major{ }{}{block}{Slow memory ramdisk} -\major{36}{}{char }{Netlink support} -\major{ }{}{block}{MCA ESDI hard disk} -\major{37}{}{char }{IDE tape} -\major{ }{}{block}{Zorro II ramdisk} -\major{38}{}{char }{Myricom PCI Myrinet board} -\major{ }{}{block}{Reserved for Linux/AP+} -\major{39}{}{char }{ML-16P experimental I/O board} -\major{ }{}{block}{Reserved for Linux/AP+} -\major{40}{}{char }{Matrox Meteor frame grabber} -\major{ }{}{block}{Syquest EZ135 parallel port removable drive} -\major{41}{}{char }{Yet Another Micro Monitor} -\major{ }{}{block}{MicroSolutions BackPack parallel port CD-ROM} -\major{42}{}{}{Demo/sample use} -\major{43}{}{char }{isdn4linux virtual modem} -\major{ }{}{block}{Network block devices} -\major{44}{}{char }{isdn4linux virtual modem -- alternate devices} -\major{ }{}{block}{Flash Translation Layer (FTL) filesystems} -\major{45}{}{char }{isdn4linux ISDN BRI driver} -\major{ }{}{block}{Parallel port IDE disk devices} -\major{46}{}{char }{Comtrol Rocketport serial card} -\major{ }{}{block}{Parallel port ATAPI CD-ROM devices} -\major{47}{}{char }{Comtrol Rocketport serial card -- alternate devices} -\major{ }{}{block}{Parallel port ATAPI disk devices} -\major{48}{}{char }{SDL RISCom serial card} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{49}{}{char }{SDL RISCom serial card -- alternate devices} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{50}{}{char}{Reserved for GLINT} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{51}{}{char }{Baycom radio modem} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{52}{}{char }{Spellcaster DataComm/BRI ISDN card} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{53}{}{char }{BDM interface for remote debugging MC683xx microcontrollers} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{54}{}{char }{Electrocardiognosis Holter serial card} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{55}{}{char }{DSP56001 digital signal processor} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\major{56}{}{char }{Apple Desktop Bus} -\major{ }{}{block}{Fifth IDE hard disk/CD-ROM interface} -\major{57}{}{char }{Hayes ESP serial card} -\major{ }{}{block}{Sixth IDE hard disk/CD-ROM interface} -\major{58}{}{char }{Hayes ESP serial card -- alternate devices} -\major{ }{}{block}{Reserved for logical volume manager} -\major{59}{}{char }{sf firewall package} -\major{60}{--63}{}{Local/experimental use} -\major{64}{}{char }{ENskip kernel encryption package} -\major{65}{}{char }{Sundance ``plink'' Transputer boards} -\major{ }{}{block}{SCSI disk devices (16-31)} -\major{66}{}{char }{YARC PowerPC PCI coprocessor card} -\major{ }{}{block}{SCSI disk devices (32-47)} -\major{67}{}{char }{Coda network filesystem} -\major{ }{}{block}{SCSI disk devices (48-63)} -\major{68}{}{char }{CAPI 2.0 interface} -\major{ }{}{block}{SCSI disk devices (64-79)} -\major{69}{}{char }{MA16 numeric accelerator card} -\major{ }{}{block}{SCSI disk devices (80-95)} -\major{70}{}{char }{SpellCaster Protocol Services Interface} -\major{ }{}{block}{SCSI disk devices (96-111)} -\major{71}{}{char }{Computone IntelliPort II serial card} -\major{ }{}{block}{SCSI disk devices (112-127)} -\major{72}{}{char }{Computone IntelliPort II serial card -- alternate devices} -\major{73}{}{char }{Computone IntelliPort II serial card -- control devices} -\major{74}{}{char }{SCI bridge} -\major{75}{}{char }{Specialix IO8+ serial card} -\major{76}{}{char }{Specialix IO8+ serial card -- alternate devices} -\major{77}{}{char }{ComScire Quantum Noise Generator} -\major{78}{}{char }{PAM Software's multimodem boards} -\major{79}{}{char }{PAM Software's multimodem boards -- alternate devices} -\major{80}{}{char }{Photometrics AT200 CCD camera} -\major{81}{}{char }{video4linux} -\major{82}{}{char }{WiNRADiO communications receiver card} -\major{83}{}{char }{Teletext/videotext interfaces} -\major{84}{}{char }{Ikon 1011[57] Versatec Greensheet Interface} -\major{85}{}{char }{Linux/SGI shared memory input queue} -\major{86}{}{char }{SCSI media changer} -\major{87}{}{char }{Sony Control-A1 stereo control bus} -\major{88}{}{char }{COMX synchronous serial card} -\major{ }{}{block}{Seventh IDE hard disk/CD-ROM interface} -\major{89}{}{char }{I$^2$C bus interface} -\major{ }{}{block}{Eighth IDE hard disk/CD-ROM interface} -\major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)} -\major{ }{}{block}{Ninth IDE hard disk/CD-ROM interface} -\major{91}{}{char }{CAN-Bus controller} -\major{ }{}{block}{Tenth IDE hard disk/CD-ROM interface} -\major{92}{}{char }{Reserved for ith Kommunikationstechnik MIC ISDN card} -\major{93}{}{char }{IBM Smart Capture Card frame grabber} -\major{94}{}{char }{miroVIDEO DC10/30 capture/playback device} -\major{95}{}{char }{IP filter} -\major{96}{}{char }{Parallel port ATAPI tape devices} -\major{97}{}{char }{Parallel port generic ATAPI interface} -\major{98}{}{char }{Control and Mesurement Device (comedi)} -\major{99}{}{char }{Raw parallel ports} -\major{100}{}{char }{POTS (analogue telephone) A/B port} -\major{101}{}{char }{Motorola DSP 56xxx board} -\major{102}{}{char }{Philips SAA5249 Teletext signal decoder} -\major{103}{}{char }{Arla network file system} -\major{104}{}{char }{Flash BIOS support} -\major{105}{}{char }{Comtrol VS-1000 serial card} -\major{106}{}{char }{Comtrol VS-1000 serial card -- alternate devices} -\major{107}{}{char }{3Dfx Voodoo Graphics device} -\major{108}{}{char }{Device independent PPP interface} -\major{109}{}{char }{Reserved for logical volume manager} -\major{110}{}{char }{miroMEDIA Surround board} -\major{111}{--119}{}{Unallocated} -\major{120}{--127}{}{Local/experimental use} -\major{128}{--135}{char }{Unix98 PTY masters} -\major{136}{--143}{char }{Unix98 PTY slaves} -\major{144}{--239}{}{Unallocated} -\major{240}{--254}{}{Local/experimental use} -\major{255}{}{}{Reserved} -\end{devicelist} - -\section{Minor numbers} - -\begin{devicelist} -\major{ 0}{}{}{Unnamed devices (e.g. non-device mounts)} - \minor{0}{}{reserved as null device number} -\end{devicelist} - -\begin{devicelist} -\major{ 1}{}{char}{Memory devices} - \minor{1}{/dev/mem}{Physical memory access} - \minor{2}{/dev/kmem}{Kernel virtual memory access} - \minor{3}{/dev/null}{Null device} - \minor{4}{/dev/port}{I/O port access} - \minor{5}{/dev/zero}{Null byte source} - \minor{6}{/dev/core}{OBSOLETE -- should be a link to {\file /proc/kcore}} - \minor{7}{/dev/full}{Returns ENOSPC on write} - \minor{8}{/dev/random}{Nondeterministic random number generator} - \minor{9}{/dev/urandom}{Less secure, but faster random number generator} -\\ -\major{}{}{block}{RAM disk} - \minor{0}{/dev/ram0}{First RAM disk} - \minordots - \minor{7}{/dev/ram7}{Eighth RAM disk} - \minor{250}{/dev/initrd}{Initial RAM disk} -\end{devicelist} - -\noindent -Earlier kernels had {\file /dev/ramdisk} (1, 1) here. {\file /dev/initrd} -refers to a RAM disk which was preloaded by the boot loader. - -\begin{devicelist} -\major{ 2}{}{char}{Pseudo-TTY masters} - \minor{0}{/dev/ptyp0}{First PTY master} - \minor{1}{/dev/ptyp1}{Second PTY master} - \minordots - \minor{255}{/dev/ptyef}{256th PTY master} -\end{devicelist} - -\noindent -Pseudo-TTY's are named as follows: -\begin{itemize} -\item Masters are {\file pty}, slaves are {\file tty}; -\item the fourth letter is one of {\file pqrstuvwxyzabcde} indicating -the 1st through 16th series of 16 pseudo-ttys each, and -\item the fifth letter is one of {\file 0123456789abcdef} indicating -the position within the series. -\end{itemize} - -\noindent -These are the old-style (BSD) PTY devices; Unix98 devices are on major -128 and above and use the PTY master multiplex ({\file /dev/ptmx}) to -acquire a PTY on demand. - -\begin{devicelist} -\major{}{}{block}{Floppy disks} - \minor{0}{/dev/fd0}{Controller 1, drive 1 autodetect} - \minor{1}{/dev/fd1}{Controller 1, drive 2 autodetect} - \minor{2}{/dev/fd2}{Controller 1, drive 3 autodetect} - \minor{3}{/dev/fd3}{Controller 1, drive 4 autodetect} - \minor{128}{/dev/fd4}{Controller 2, drive 1 autodetect} - \minor{129}{/dev/fd5}{Controller 2, drive 2 autodetect} - \minor{130}{/dev/fd6}{Controller 2, drive 3 autodetect} - \minor{131}{/dev/fd7}{Controller 2, drive 4 autodetect} -\\ -\major{}{}{}{To specify format, add to the autodetect device number} - \minor{ 0}{/dev/fd?}{Autodetect format} - \minor{}{}{} - \minor{ 4}{/dev/fd?d360}{5.25\tum\ \num{4}{360}K in a \num{4}{360}K drive\1} - \minor{ 20}{/dev/fd?h360}{5.25\tum\ \num{4}{360}K in a 1200K drive\1} - \minor{ 48}{/dev/fd?h410}{5.25\tum\ \num{4}{410}K in a 1200K drive} - \minor{ 64}{/dev/fd?h420}{5.25\tum\ \num{4}{420}K in a 1200K drive} - \minor{ 24}{/dev/fd?h720}{5.25\tum\ \num{4}{720}K in a 1200K drive} - \minor{ 80}{/dev/fd?h880}{5.25\tum\ \num{4}{880}K in a 1200K drive\1} - \minor{ 8}{/dev/fd?h1200}{5.25\tum\ 1200K in a 1200K drive\1} - \minor{ 40}{/dev/fd?h1440}{5.25\tum\ 1440K in a 1200K drive\1} - \minor{ 56}{/dev/fd?h1476}{5.25\tum\ 1476K in a 1200K drive} - \minor{ 72}{/dev/fd?h1494}{5.25\tum\ 1494K in a 1200K drive} - \minor{ 92}{/dev/fd?h1600}{5.25\tum\ 1600K in a 1200K drive\1} - \minor{}{}{} - \minor{ 12}{/dev/fd?u360}{3.5\tum\ \num{4}{360}K Double Density\2} - \minor{ 16}{/dev/fd?u720}{3.5\tum\ \num{4}{720}K Double Density\1} - \minor{120}{/dev/fd?u800}{3.5\tum\ \num{4}{800}K Double Density\2} - \minor{ 52}{/dev/fd?u820}{3.5\tum\ \num{4}{820}K Double Density} - \minor{ 68}{/dev/fd?u830}{3.5\tum\ \num{4}{830}K Double Density} - \minor{ 84}{/dev/fd?u1040}{3.5\tum\ 1040K Double Density\1} - \minor{ 88}{/dev/fd?u1120}{3.5\tum\ 1120K Double Density\1} - \minor{ 28}{/dev/fd?u1440}{3.5\tum\ 1440K High Density\1} - \minor{124}{/dev/fd?u1600}{3.5\tum\ 1600K High Density\1} - \minor{ 44}{/dev/fd?u1680}{3.5\tum\ 1680K High Density\3} - \minor{ 60}{/dev/fd?u1722}{3.5\tum\ 1722K High Density} - \minor{ 76}{/dev/fd?u1743}{3.5\tum\ 1743K High Density} - \minor{ 96}{/dev/fd?u1760}{3.5\tum\ 1760K High Density} - \minor{116}{/dev/fd?u1840}{3.5\tum\ 1840K High Density\3} - \minor{100}{/dev/fd?u1920}{3.5\tum\ 1920K High Density\1} - \minor{ 32}{/dev/fd?u2880}{3.5\tum\ 2880K Extra Density\1} - \minor{104}{/dev/fd?u3200}{3.5\tum\ 3200K Extra Density} - \minor{108}{/dev/fd?u3520}{3.5\tum\ 3520K Extra Density} - \minor{112}{/dev/fd?u3840}{3.5\tum\ 3840K Extra Density\1} - \minor{}{}{} - \minor{36}{/dev/fd?CompaQ}{Compaq 2880K drive; probably obsolete} -\\ -\major{}{}{}{\1 Autodetectable format} -\major{}{}{}{\2 Autodetectable format in a Double Density (720K) drive only} -\major{}{}{}{\3 Autodetectable format in a High Density (1440K) drive only} -\end{devicelist} - -NOTE: The letter in the device name ({\file d}, {\file q}, {\file h} -or {\file u}) signifies the type of drive supported: 5.25\tum\ Double -Density ({\file d}), 5.25\tum\ Quad Density ({\file q}), 5.25\tum\ -High Density ({\file h}) or 3.5\tum\ (any type, {\file u}). The -capital letters {\file D}, {\file H}, or {\file E} for the 3.5\tum\ -models have been deprecated, since the drive type is insignificant for -these devices. - -\begin{devicelist} -\major{ 3}{}{char}{Pseudo-TTY slaves} - \minor{0}{/dev/ttyp0}{First PTY slave} - \minor{1}{/dev/ttyp1}{Second PTY slave} - \minordots - \minor{255}{/dev/ttyef}{256th PTY slave} -\end{devicelist} - -\noindent -These are the old-style (BSD) PTY devices; Unix98 devices are on major -136 and above. - -\begin{devicelist} -\major{}{}{block}{First MFM, RLL and IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hda}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdb}{Slave: whole disk (or CD-ROM)} -\\ -\major{}{}{}{For partitions, add to the whole disk device number} - \minor{0}{/dev/hd?}{Whole disk} - \minor{1}{/dev/hd?1}{First partition} - \minor{2}{/dev/hd?2}{Second partition} - \minordots - \minor{63}{/dev/hd?63}{63rd partition} -\end{devicelist} - -\noindent -For MS-DOS style partition tables (typically used by Linux/i386 and -sometimes on Linux/Alpha), partitions 1-4 are the primary partitions, -partitions 5 and up are logical partitions. For other partitioning -schemes, the meaning of the numbers vary. - -\begin{devicelist} -\major{ 4}{}{char }{TTY devices} - \minor{0}{/dev/tty0}{Current virtual console} - \minor{1}{/dev/tty1}{First virtual console} - \minordots - \minor{63}{/dev/tty63}{63rd virtual console} - \minor{64}{/dev/ttyS0}{First serial port} - \minordots - \minor{127}{/dev/ttyS63}{64th serial port} - \minor{128}{/dev/ptyp0}{OBSOLETE} - \minordots - \minor{191}{/dev/ptysf}{OBSOLETE} - \minor{192}{/dev/ttyp0}{OBSOLETE} - \minordots - \minor{255}{/dev/ttysf}{OBSOLETE} -\end{devicelist} - -\noindent -Older versions of the Linux kernel used this major number for BSD PTY -devices. As of Linux 2.1.115, this is no longer supported. Use major -numbers 2 and 3. - -\begin{devicelist} -\major{ 5}{}{char }{Alternate TTY devices} - \minor{0}{/dev/tty}{Current TTY device} - \minor{1}{/dev/console}{System console} - \minor{2}{/dev/ptmx}{PTY master multiplex} - \minor{64}{/dev/cua0}{Callout device corresponding to {\file ttyS0}} - \minordots - \minor{127}{/dev/cua63}{Callout device corresponding to {\file ttyS63}} -\end{devicelist} - -\noindent -(5,1) is {\file /dev/console} starting with Linux 2.1.71. See the -section on terminal devices for more information on {\file /dev/console}. - -\begin{devicelist} -\major{ 6}{}{char }{Parallel printer devices} - \minor{0}{/dev/lp0}{First parallel printer ({\hex 0x3bc})} - \minor{1}{/dev/lp1}{Second parallel printer ({\hex 0x378})} - \minor{2}{/dev/lp2}{Third parallel printer ({\hex 0x278})} -\end{devicelist} - -\noindent -Not all computers have the {\hex 0x3bc} parallel port, hence the -"first" printer may be either {\file /dev/lp0} or {\file /dev/lp1}. - -\begin{devicelist} -\major{ 7}{}{char }{Virtual console access devices} - \minor{0}{/dev/vcs}{Current vc text access} - \minor{1}{/dev/vcs1}{tty1 text access} - \minordots - \minor{63}{/dev/vcs63}{tty63 text access} - \minor{128}{/dev/vcsa}{Current vc text/attribute access} - \minor{129}{/dev/vcsa1}{tty1 text/attribute access} - \minordots - \minor{191}{/dev/vcsa63}{tty63 text/attribute access} -\end{devicelist} - -\noindent -NOTE: These devices permit both read and write access. - -\begin{devicelist} -\major{ }{}{block}{Loopback devices} - \minor{0}{/dev/loop0}{First loopback device} - \minor{1}{/dev/loop1}{Second loopback device} - \minordots -\end{devicelist} - -\noindent -The loopback devices are used to mount filesystems not associated with -block devices. The binding to the loopback devices is handled by -{\bf mount}(8) or {\bf losetup}(8). - -\begin{devicelist} -\major{ 8}{}{block}{SCSI disk devices (0-15)} - \minor{0}{/dev/sda}{First SCSI disk whole disk} - \minor{16}{/dev/sdb}{Second SCSI disk whole disk} - \minor{32}{/dev/sdc}{Third SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdp}{Sixteenth SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{ 9}{}{char }{SCSI tape devices} - \minor{0}{/dev/st0}{First SCSI tape, mode 0} - \minor{1}{/dev/st1}{Second SCSI tape, mode 0} - \minordots - \minor{32}{/dev/st0l}{First SCSI tape, mode 1} - \minor{33}{/dev/st1l}{Second SCSI tape, mode 1} - \minordots - \minor{64}{/dev/st0m}{First SCSI tape, mode 2} - \minor{65}{/dev/st1m}{Second SCSI tape, mode 2} - \minordots - \minor{96}{/dev/st0a}{First SCSI tape, mode 3} - \minor{97}{/dev/st1a}{Second SCSI tape, mode 4} - \minordots - \minor{128}{/dev/nst0}{First SCSI tape, mode 0, no rewind} - \minor{129}{/dev/nst1}{Second SCSI tape, mode 0, no rewind} - \minordots - \minor{160}{/dev/nst0l}{First SCSI tape, mode 1, no rewind} - \minor{161}{/dev/nst1l}{Second SCSI tape, mode 1, no rewind} - \minordots - \minor{192}{/dev/nst0m}{First SCSI tape, mode 2, no rewind} - \minor{193}{/dev/nst1m}{Second SCSI tape, mode 2, no rewind} - \minordots - \minor{224}{/dev/nst0a}{First SCSI tape, mode 3, no rewind} - \minor{225}{/dev/nst1a}{Second SCSI tape, mode 3, no rewind} - \minordots -\end{devicelist} - -\noindent -``No rewind'' refers to the omission of the default automatic rewind -on device close. The {\file MTREW} or {\file MTOFFL} ioctl()s can be -used to rewind the tape regardless of the device used to access it. - -\begin{devicelist} -\major{ }{}{block}{Metadisk (RAID) devices} - \minor{0}{/dev/md0}{First metadisk group} - \minor{1}{/dev/md1}{Second metadisk group} - \minordots -\end{devicelist} - -\noindent -The metadisk driver is used to span a filesystem across multiple -physical disks. - -\begin{devicelist} -\major{10}{}{char }{Non-serial mice, misc features} - \minor{0}{/dev/logibm}{Logitech bus mouse} - \minor{1}{/dev/psaux}{PS/2-style mouse port} - \minor{2}{/dev/inportbm}{Microsoft Inport bus mouse} - \minor{3}{/dev/atibm}{ATI XL bus mouse} - \minor{4}{/dev/jbm}{J-mouse} - \minor{4}{/dev/amigamouse}{Amiga mouse (68k/Amiga)} - \minor{5}{/dev/atarimouse}{Atari mouse} - \minor{6}{/dev/sunmouse}{Sun mouse} - \minor{7}{/dev/amigamouse1}{Second Amiga mouse} - \minor{8}{/dev/smouse}{Simple serial mouse driver} - \minor{9}{/dev/pc110pad}{IBM PC-110 digitizer pad} - \minor{128}{/dev/beep}{Fancy beep device} - \minor{129}{/dev/modreq}{Kernel module load request} - \minor{130}{/dev/watchdog}{Watchdog timer port} - \minor{131}{/dev/temperature}{Machine internal temperature} - \minor{132}{/dev/hwtrap}{Hardware fault trap} - \minor{133}{/dev/exttrp}{External device trap} - \minor{134}{/dev/apm\_bios}{Advanced Power Management BIOS} - \minor{135}{/dev/rtc}{Real Time Clock} - \minor{139}{/dev/openprom}{SPARC OpenBoot PROM} - \minor{140}{/dev/relay8}{Berkshire Products Octal relay card} - \minor{141}{/dev/relay16}{Berkshire Products ISO-16 relay card} - \minor{142}{/dev/msr}{x86 model specific registers} - \minor{143}{/dev/pciconf}{PCI configuration space} - \minor{144}{/dev/nvram}{Non-volatile configuration RAM} - \minor{145}{/dev/hfmodem}{Soundcard shortwave modem control} - \minor{146}{/dev/graphics}{Linux/SGI graphics device} - \minor{147}{/dev/opengl}{Linux/SGI OpenGL pipe} - \minor{148}{/dev/gfx}{Linux/SGI graphics effects device} - \minor{149}{/dev/input/mouse}{Linux/SGI Irix emulation mouse} - \minor{150}{/dev/input/keyboard}{Linux/SGI Irix emulation keyboard} - \minor{151}{/dev/led}{Front panel LEDs} - \minor{153}{/dev/mergemem}{Memory merge device} - \minor{154}{/dev/pmu}{Macintosh PowerBook power manager} -\end{devicelist} - -\begin{devicelist} -\major{11}{}{char }{Raw keyboard device} - \minor{0}{/dev/kbd}{Raw keyboard device} -\end{devicelist} - -\noindent -The raw keyboard device is used on Linux/SPARC only. - -\begin{devicelist} -\major{ }{}{block}{SCSI CD-ROM devices} - \minor{0}{/dev/sr0}{First SCSI CD-ROM} - \minor{1}{/dev/sr1}{Second SCSI CD-ROM} - \minordots -\end{devicelist} - -\noindent -The prefix {\file /dev/scd} instead of {\file /dev/sr} has been used -as well, and might make more sense. - -\begin{devicelist} -\major{12}{}{char }{QIC-02 tape} - \minor{2}{/dev/ntpqic11}{QIC-11, no rewind-on-close} - \minor{3}{/dev/tpqic11}{QIC-11, rewind-on-close} - \minor{4}{/dev/ntpqic24}{QIC-24, no rewind-on-close} - \minor{5}{/dev/tpqic24}{QIC-24, rewind-on-close} - \minor{6}{/dev/ntpqic120}{QIC-120, no rewind-on-close} - \minor{7}{/dev/tpqic120}{QIC-120, rewind-on-close} - \minor{8}{/dev/ntpqic150}{QIC-150, no rewind-on-close} - \minor{9}{/dev/tpqic150}{QIC-150, rewind-on-close} -\end{devicelist} - -\noindent -The device names specified are proposed -- if there are ``standard'' -names for these devices, please let me know. - -\begin{devicelist} -\major{ }{}{block}{MSCDEX CD-ROM callback support} - \minor{0}{/dev/dos\_cd0}{First MSCDEX CD-ROM} - \minor{1}{/dev/dos\_cd1}{Second MSCDEX CD-ROM} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{13}{}{char }{PC speaker} - \minor{0}{/dev/pcmixer}{Emulates {\file /dev/mixer}} - \minor{3}{/dev/pcsp}{Emulates {\file /dev/dsp} (8-bit)} - \minor{4}{/dev/pcaudio}{Emulates {\file /dev/audio}} - \minor{5}{/dev/pcsp16}{Emulates {\file /dev/dsp} (16-bit)} -\\ -\major{ }{}{block}{8-bit MFM/RLL/IDE controller} - \minor{0}{/dev/xda}{First XT disk whole disk} - \minor{64}{/dev/xdb}{Second XT disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3). - -\begin{devicelist} -\major{14}{}{char }{Sound card} - \minor{0}{/dev/mixer}{Mixer control} - \minor{1}{/dev/sequencer}{Audio sequencer} - \minor{2}{/dev/midi00}{First MIDI port} - \minor{3}{/dev/dsp}{Digital audio} - \minor{4}{/dev/audio}{Sun-compatible digital audio} - \minor{6}{/dev/sndstat}{Sound card status information} - \minor{8}{/dev/sequencer2}{Sequencer -- alternate device} - \minor{16}{/dev/mixer1}{Second soundcard mixer control} - \minor{17}{/dev/patmgr0}{Sequencer patch manager} - \minor{18}{/dev/midi01}{Second MIDI port} - \minor{19}{/dev/dsp1}{Second soundcard digital audio} - \minor{20}{/dev/audio1}{Second soundcard Sun digital audio} - \minor{33}{/dev/patmgr1}{Sequencer patch manager} - \minor{34}{/dev/midi02}{Third MIDI port} - \minor{50}{/dev/midi03}{Fourth MIDI port} -\\ -\major{ }{}{block}{BIOS harddrive callback support} - \minor{0}{/dev/dos\_hda}{First BIOS harddrive whole disk} - \minor{64}{/dev/dos\_hdb}{Second BIOS harddrive whole disk} - \minor{128}{/dev/dos\_hdc}{Third BIOS harddrive whole disk} - \minor{192}{/dev/dos\_hdd}{Fourth BIOS harddrive whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3). - -\begin{devicelist} -\major{15}{}{char }{Joystick} - \minor{0}{/dev/js0}{First analog joystick} - \minor{1}{/dev/js1}{Second analog joystick} - \minordots - \minor{128}{/dev/djs0}{First digital joystick} - \minor{129}{/dev/djs1}{Second digital joystick} - \minordots -\\ -\major{ }{}{block}{Sony CDU-31A/CDU-33A CD-ROM} - \minor{0}{/dev/sonycd}{Sony CDU-31A CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{16}{}{char }{Non-SCSI scanners} - \minor{0}{/dev/gs4500}{Genius 4500 handheld scanner} -\\ -\major{ }{}{block}{GoldStar CD-ROM} - \minor{0}{/dev/gscd}{GoldStar CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{17}{}{char }{Chase serial card} - \minor{0}{/dev/ttyH0}{First Chase port} - \minor{1}{/dev/ttyH1}{Second Chase port} - \minordots -\\ -\major{ }{}{block}{Optics Storage CD-ROM} - \minor{0}{/dev/optcd}{Optics Storage CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{18}{}{char }{Chase serial card -- alternate devices} - \minor{0}{/dev/cuh0}{Callout device corresponding to {\file ttyH0}} - \minor{1}{/dev/cuh1}{Callout device corresponding to {\file ttyH1}} - \minordots -\\ -\major{ }{}{block}{Sanyo CD-ROM} - \minor{0}{/dev/sjcd}{Sanyo CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{19}{}{char }{Cyclades serial card} - \minor{0}{/dev/ttyC0}{First Cyclades port} - \minordots - \minor{31}{/dev/ttyC31}{32nd Cyclades port} -\\ -\major{ }{}{block}{``Double'' compressed disk} - \minor{0}{/dev/double0}{First compressed disk} - \minordots - \minor{7}{/dev/double7}{Eighth compressed disk} - \minor{128}{/dev/cdouble0}{Mirror of first compressed disk} - \minordots - \minor{135}{/dev/cdouble7}{Mirror of eighth compressed disk} -\end{devicelist} - -\noindent -See the Double documentation for an explanation of the ``mirror'' devices. - -\begin{devicelist} -\major{20}{}{char }{Cyclades serial card -- alternate devices} - \minor{0}{/dev/cub0}{Callout device corresponding to {\file ttyC0}} - \minordots - \minor{31}{/dev/cub31}{Callout device corresponding to {\file ttyC31}} -\\ -\major{ }{}{block}{Hitachi CD-ROM} - \minor{0}{/dev/hitcd}{Hitachi CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{21}{}{char }{Generic SCSI access} - \minor{0}{/dev/sg0}{First generic SCSI device} - \minor{1}{/dev/sg1}{Second generic SCSI device} - \minordots -\end{devicelist} - -\noindent -Most distributions name these {\file /dev/sga}, {\file /dev/sgb}... -This sets an unneccesary limit of 26 SCSI devices in the system, and -is counter to standard Linux device-naming practice. - -\begin{devicelist} -\major{ }{}{block }{Acorn MFM hard drive interface} - \minor{0}{/dev/mfma}{First MFM drive whole disk} - \minor{64}{/dev/mfmb}{Second MFM drive whole disk} -\end{devicelist} - -\noindent -This device is used on the ARM-based Acorn RiscPC. Partitions are -handled the same way as for IDE disks (see major number 3). - -\begin{devicelist} -\major{22}{}{char }{Digiboard serial card} - \minor{0}{/dev/ttyD0}{First Digiboard port} - \minor{1}{/dev/ttyD1}{Second Digiboard port} - \minordots -\\ -\major{ }{}{block}{Second IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdc}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdd}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{23}{}{char }{Digiboard serial card -- alternate devices} - \minor{0}{/dev/cud0}{Callout device corresponding to {\file ttyD0}} - \minor{1}{/dev/cud1}{Callout device corresponding to {\file ttyD1}} - \minordots -\major{ }{}{block}{Mitsumi proprietary CD-ROM} - \minor{0}{/dev/mcd}{Mitsumi CD-ROM} -\end{devicelist} - -\begin{devicelist}\ -\major{24}{}{char }{Stallion serial card} - \minor{0}{/dev/ttyE0}{Stallion port 0 board 0} - \minor{1}{/dev/ttyE1}{Stallion port 1 board 0} - \minordots - \minor{64}{/dev/ttyE64}{Stallion port 0 board 1} - \minor{65}{/dev/ttyE65}{Stallion port 1 board 1} - \minordots - \minor{128}{/dev/ttyE128}{Stallion port 0 board 2} - \minor{129}{/dev/ttyE129}{Stallion port 1 board 2} - \minordots - \minor{192}{/dev/ttyE192}{Stallion port 0 board 3} - \minor{193}{/dev/ttyE193}{Stallion port 1 board 3} - \minordots -\\ -\major{ }{}{block}{Sony CDU-535 CD-ROM} - \minor{0}{/dev/cdu535}{Sony CDU-535 CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{25}{}{char }{Stallion serial card -- alternate devices} - \minor{0}{/dev/cue0}{Callout device corresponding to {\file ttyE0}} - \minor{1}{/dev/cue1}{Callout device corresponding to {\file ttyE1}} - \minordots - \minor{64}{/dev/cue64}{Callout device corresponding to {\file ttyE64}} - \minor{65}{/dev/cue65}{Callout device corresponding to {\file ttyE65}} - \minordots - \minor{128}{/dev/cue128}{Callout device corresponding to {\file ttyE128}} - \minor{129}{/dev/cue129}{Callout device corresponding to {\file ttyE129}} - \minordots - \minor{192}{/dev/cue192}{Callout device corresponding to {\file ttyE192}} - \minor{193}{/dev/cue193}{Callout device corresponding to {\file ttyE193}} - \minordots -\\ -\major{ }{}{block}{First Matsushita (Panasonic/SoundBlaster) CD-ROM} - \minor{0}{/dev/sbpcd0}{Panasonic CD-ROM controller 0 unit 0} - \minor{1}{/dev/sbpcd1}{Panasonic CD-ROM controller 0 unit 1} - \minor{2}{/dev/sbpcd2}{Panasonic CD-ROM controller 0 unit 2} - \minor{3}{/dev/sbpcd3}{Panasonic CD-ROM controller 0 unit 3} -\end{devicelist} - -\begin{devicelist} -\major{26}{}{char }{Quanta WinVision frame grabber} - \minor{0}{/dev/wvisfgrab}{Quanta WinVision frame grabber} -\\ -\major{ }{}{block}{Second Matsushita (Panasonic/SoundBlaster) CD-ROM} - \minor{0}{/dev/sbpcd4}{Panasonic CD-ROM controller 1 unit 0} - \minor{1}{/dev/sbpcd5}{Panasonic CD-ROM controller 1 unit 1} - \minor{2}{/dev/sbpcd6}{Panasonic CD-ROM controller 1 unit 2} - \minor{3}{/dev/sbpcd7}{Panasonic CD-ROM controller 1 unit 3} -\end{devicelist} - -\begin{devicelist} -\major{27}{}{char }{QIC-117 tape} - \minor{0}{/dev/qft0}{Unit 0, rewind-on-close} - \minor{1}{/dev/qft1}{Unit 1, rewind-on-close} - \minor{2}{/dev/qft2}{Unit 2, rewind-on-close} - \minor{3}{/dev/qft3}{Unit 3, rewind-on-close} - \minor{4}{/dev/nqft0}{Unit 0, no rewind-on-close} - \minor{5}{/dev/nqft1}{Unit 1, no rewind-on-close} - \minor{6}{/dev/nqft2}{Unit 2, no rewind-on-close} - \minor{7}{/dev/nqft3}{Unit 3, no rewind-on-close} - \minor{16}{/dev/zqft0}{Unit 0, rewind-on-close, compression} - \minor{17}{/dev/zqft1}{Unit 1, rewind-on-close, compression} - \minor{18}{/dev/zqft2}{Unit 2, rewind-on-close, compression} - \minor{19}{/dev/zqft3}{Unit 3, rewind-on-close, compression} - \minor{20}{/dev/nzqft0}{Unit 0, no rewind-on-close, compression} - \minor{21}{/dev/nzqft1}{Unit 1, no rewind-on-close, compression} - \minor{22}{/dev/nzqft2}{Unit 2, no rewind-on-close, compression} - \minor{23}{/dev/nzqft3}{Unit 3, no rewind-on-close, compression} - \minor{32}{/dev/rawqft0}{Unit 0, rewind-on-close, no file marks} - \minor{33}{/dev/rawqft1}{Unit 1, rewind-on-close, no file marks} - \minor{34}{/dev/rawqft2}{Unit 2, rewind-on-close, no file marks} - \minor{35}{/dev/rawqft3}{Unit 3, rewind-on-close, no file marks} - \minor{36}{/dev/nrawqft0}{Unit 0, no rewind-on-close, no file marks} - \minor{37}{/dev/nrawqft1}{Unit 1, no rewind-on-close, no file marks} - \minor{38}{/dev/nrawqft2}{Unit 2, no rewind-on-close, no file marks} - \minor{39}{/dev/nrawqft3}{Unit 3, no rewind-on-close, no file marks} -\\ -\major{ }{}{block}{Third Matsushita (Panasonic/SoundBlaster) CD-ROM} - \minor{0}{/dev/sbpcd8}{Panasonic CD-ROM controller 2 unit 0} - \minor{1}{/dev/sbpcd9}{Panasonic CD-ROM controller 2 unit 1} - \minor{2}{/dev/sbpcd10}{Panasonic CD-ROM controller 2 unit 2} - \minor{3}{/dev/sbpcd11}{Panasonic CD-ROM controller 2 unit 3} -\end{devicelist} - -\begin{devicelist} -\major{28}{}{char }{Stallion serial card -- card programming} - \minor{0}{/dev/staliomem0}{First Stallion I/O card memory} - \minor{1}{/dev/staliomem1}{Second Stallion I/O card memory} - \minor{2}{/dev/staliomem2}{Third Stallion I/O card memory} - \minor{3}{/dev/staliomem3}{Fourth Stallion I/O card memory} -\\ -\major{ }{}{char }{Atari SLM ACSI laser printer (68k/Atari)} - \minor{0}{/dev/slm0}{First SLM laser printer} - \minor{1}{/dev/slm1}{Second SLM laser printer} - \minordots -\\ -\major{ }{}{block}{Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM} - \minor{0}{/dev/sbpcd12}{Panasonic CD-ROM controller 3 unit 0} - \minor{1}{/dev/sbpcd13}{Panasonic CD-ROM controller 3 unit 1} - \minor{2}{/dev/sbpcd14}{Panasonic CD-ROM controller 3 unit 2} - \minor{3}{/dev/sbpcd15}{Panasonic CD-ROM controller 3 unit 3} -\\ -\major{ }{}{block}{ACSI disk/CD-ROM (68k/Atari)} - \minor{0}{/dev/ada}{First ACSI disk whole disk} - \minor{16}{/dev/adb}{Second ACSI disk whole disk} - \minor{32}{/dev/adc}{Third ACSI disk whole disk} - \minordots - \minor{240}{/dev/adp}{Sixteenth ACSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk (same as SCSI.) - -\begin{devicelist} -\major{29}{}{char }{Universal frame buffer} - \minor{0}{/dev/fb0}{First frame buffer} - \minor{1}{/dev/fb1}{Second frame buffer} - \minor{2}{/dev/fb2}{Third frame buffer} - \minordots - \minor{31}{/dev/fb31}{32nd frame buffer} -\end{devicelist} - -\noindent -All additional minor device numbers are reserved. - -\begin{devicelist} -\major{ }{}{block}{Aztech/Orchid/Okano/Wearnes CD-ROM} - \minor{0}{/dev/aztcd}{Aztech CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{30}{}{char }{iBCS-2 compatibility devices} - \minor{0}{/dev/socksys}{Socket access} - \minor{1}{/dev/spx}{SVR3 local X interface} - \minor{2}{/dev/inet/arp}{Network access} - \minor{2}{/dev/inet/icmp}{Network access} - \minor{2}{/dev/inet/ip}{Network access} - \minor{2}{/dev/inet/udp}{Network access} - \minor{2}{/dev/inet/tcp}{Network access} -\end{devicelist} - -\noindent -Additionally, iBCS-2 requires {\file /dev/nfsd} to be a link to {\file -/dev/socksys} and {\file /dev/X0R} to be a link to {\file /dev/null}. - -\begin{devicelist} -\major{ }{}{block}{Philips LMS CM-205 CD-ROM} - \minor{0}{/dev/cm205cd}{Philips LMS CM-205 CD-ROM} -\end{devicelist} - -\noindent -{\file /dev/lmscd} is an older name for this drive. This driver does -not work with the CM-205MS CD-ROM. - -\begin{devicelist} -\major{31}{}{char }{MPU-401 MIDI} - \minor{0}{/dev/mpu401data}{MPU-401 data port} - \minor{1}{/dev/mpu401stat}{MPU-401 status port} -\\ -\major{ }{}{block}{ROM/flash memory card} - \minor{0}{/dev/rom0}{First ROM card (rw)} - \minordots - \minor{7}{/dev/rom7}{Eighth ROM card (rw)} - \minor{8}{/dev/rrom0}{First ROM card (ro)} - \minordots - \minor{15}{/dev/rrom0}{Eighth ROM card (ro)} - \minor{16}{/dev/flash0}{First flash memory card (rw)} - \minordots - \minor{23}{/dev/flash7}{Eighth flash memory card (rw)} - \minor{24}{/dev/rflash0}{First flash memory card (ro)} - \minordots - \minor{31}{/dev/rflash7}{Eighth flash memory card (ro)} -\end{devicelist} - -\noindent -The read-write (rw) devices support back-caching written data in RAM, -as well as writing to flash RAM devices. The read-only devices (ro) -support reading only. - -\begin{devicelist} -\major{32}{}{char }{Specialix serial card} - \minor{0}{/dev/ttyX0}{First Specialix port} - \minor{1}{/dev/ttyX1}{Second Specialix port} - \minordots -\\ -\major{ }{}{block}{Philips LMS CM-206 CD-ROM} - \minor{0}{/dev/cm206cd}{Philips LMS CM-206 CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{33}{}{char }{Specialix serial card -- alternate devices} - \minor{0}{/dev/cux0}{Callout device corresponding to {\file ttyX0}} - \minor{1}{/dev/cux1}{Callout device corresponding to {\file ttyX1}} - \minordots -\\ -\major{ }{}{block}{Third IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hde}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdf}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{34}{}{char }{Z8530 HDLC driver} - \minor{0}{/dev/scc0}{First Z8530, first port} - \minor{1}{/dev/scc1}{First Z8530, second port} - \minor{2}{/dev/scc2}{Second Z8530, first port} - \minor{3}{/dev/scc3}{Second Z8530, second port} - \minordots -\end{devicelist} - -\noindent -In a previous version these devices were named {\file /dev/sc1} for -{\file /dev/scc0}, {\file /dev/sc2} for {\file /dev/scc1}, and so on. - -\begin{devicelist} -\major{ }{}{block}{Fourth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdg}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdh}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{35}{}{char }{tclmidi MIDI driver} - \minor{0}{/dev/midi0}{First MIDI port, kernel timed} - \minor{1}{/dev/midi1}{Second MIDI port, kernel timed} - \minor{2}{/dev/midi2}{Third MIDI port, kernel timed} - \minor{3}{/dev/midi3}{Fourth MIDI port, kernel timed} - \minor{64}{/dev/rmidi0}{First MIDI port, untimed} - \minor{65}{/dev/rmidi1}{Second MIDI port, untimed} - \minor{66}{/dev/rmidi2}{Third MIDI port, untimed} - \minor{67}{/dev/rmidi3}{Fourth MIDI port, untimed} - \minor{128}{/dev/smpte0}{First MIDI port, SMPTE timed} - \minor{129}{/dev/smpte1}{Second MIDI port, SMPTE timed} - \minor{130}{/dev/smpte2}{Third MIDI port, SMPTE timed} - \minor{131}{/dev/smpte3}{Fourth MIDI port, SMPTE timed} -\\ -\major{ }{}{block}{Slow memory ramdisk} - \minor{0}{/dev/slram}{Slow memory ramdisk} -\end{devicelist} - -\begin{devicelist} -\major{36}{}{char }{Netlink support} - \minor{0}{/dev/route}{Routing, device updates (kernel to user)} - \minor{1}{/dev/skip}{enSKIP security cache control} -\\ -\major{ }{}{block}{MCA ESDI hard disk} - \minor{0}{/dev/eda}{First ESDI disk whole disk} - \minor{64}{/dev/edb}{Second ESDI disk whole disk} - \minordots -\end{devicelist} - -\noindent -Partitions are handled the same way as for IDE disks (see major number -3). - -\begin{devicelist} -\major{37}{}{char }{IDE tape} - \minor{0}{/dev/ht0}{First IDE tape} - \minor{128}{/dev/nht0}{First IDE tape, no rewind-on-close} -\end{devicelist} - -\noindent -Currently, only one IDE tape drive is supported. - -\begin{devicelist} -\major{ }{}{block}{Zorro II ramdisk} - \minor{0}{/dev/z2ram}{Zorro II ramdisk} -\end{devicelist} - -\begin{devicelist} -\major{38}{}{char }{Myricom PCI Myrinet board} - \minor{0}{/dev/mlanai0}{First Myrinet board} - \minor{1}{/dev/mlanai1}{Second Myrinet board} - \minordots -\end{devicelist} - -\noindent -This device is used for board control, status query and ``user level -packet I/O''. The board is also accessible as a regular {\file eth} -networking device. - -\begin{devicelist} -\major{ }{}{block}{Reserved for Linux/AP+} -\end{devicelist} - -\begin{devicelist} -\major{39}{}{char }{ML-16P experimental I/O board} - \minor{0}{/dev/ml16pa-a0}{First card, first analog channel} - \minor{1}{/dev/ml16pa-a1}{First card, second analog channel} - \minordots - \minor{15}{/dev/ml16pa-a15}{First card, 16th analog channel} - \minor{16}{/dev/ml16pa-d}{First card, digital lines} - \minor{17}{/dev/ml16pa-c0}{First card, first counter/timer} - \minor{18}{/dev/ml16pa-c1}{First card, second counter/timer} - \minor{19}{/dev/ml16pa-c2}{First card, third counter/timer} - \minor{32}{/dev/ml16pb-a0}{Second card, first analog channel} - \minor{33}{/dev/ml16pb-a1}{Second card, second analog channel} - \minordots - \minor{47}{/dev/ml16pb-a15}{Second card, 16th analog channel} - \minor{48}{/dev/ml16pb-d}{Second card, digital lines} - \minor{49}{/dev/ml16pb-c0}{Second card, first counter/timer} - \minor{50}{/dev/ml16pb-c1}{Second card, second counter/timer} - \minor{51}{/dev/ml16pb-c2}{Second card, third counter/timer} - \minordots -\\ -\major{ }{}{block}{Reserved for Linux/AP+} -\end{devicelist} - -\begin{devicelist} -\major{40}{}{char }{Matrox Meteor frame grabber} - \minor{0}{/dev/mmetfgrab}{Matrox Meteor frame grabber} -\\ -\major{ }{}{block}{Syquest EZ135 parallel port removable drive} - \minor{0}{/dev/eza}{Parallel EZ135 drive whole disk} -\end{devicelist} - -\noindent -This device is obsolete and will be removed in a future version of -Linux. It has been replaced with the parallel port IDE disk driver at -major number 45. Partitions are handled the same way as for IDE disks -(see major number 3). - -\begin{devicelist} -\major{41}{}{char }{Yet Another Micro Monitor} - \minor{0}{/dev/yamm}{Yet Another Micro Monitor} -\\ -\major{ }{}{block}{MicroSolutions BackPack parallel port CD-ROM} - \minor{0}{/dev/bpcd}{BackPack CD-ROM} -\end{devicelist} - -\noindent -This device is obsolete and will be removed in a future version of -Linux. It has been replaced with the parallel port ATAPI CD-ROM -driver at major number 46. - -\begin{devicelist} -\major{42}{}{}{Demo/sample use} -\end{devicelist} - -\noindent -This number is intended for use in sample code, as well as a general -``example'' device number. It should never be used for a device -driver that is being distributed; either obtain an official number or -use the local/experimental range. The sudden addition or removal of a -driver with this number should not cause ill effects to the system -(bugs excepted.) - -IN PARTICULAR, ANY DISTRIBUTION WHICH CONTAINS A DEVICE DRIVER USING -MAJOR NUMBER 42 IS NONCOMPLIANT. - -\begin{devicelist} -\major{43}{}{char }{isdn4linux virtual modem} - \minor{0}{/dev/ttyI0}{First virtual modem} - \minordots - \minor{63}{/dev/ttyI63}{64th virtual modem} -\\ -\major{ }{}{block}{Network block devices} - \minor{0}{/dev/nd0}{First network block device} - \minor{1}{/dev/nd1}{Second network block device} - \minordots -\end{devicelist} - -\noindent -Network Block Device is somehow similar to loopback devices: If you -read from it, it sends packet accross network asking server for -data. If you write to it, it sends packet telling server to write. It -could be used to mounting filesystems over the net, swapping over the -net, implementing block device in userland etc. - -\begin{devicelist} -\major{44}{}{char }{isdn4linux virtual modem -- alternate devices} - \minor{0}{/dev/cui0}{Callout device corresponding to {\file ttyI0}} - \minordots - \minor{63}{/dev/cui63}{Callout device corresponding to {\file ttyI63}} -\\ -\major{ }{}{block}{Flash Translation Layer (FTL) filesystems} - \minor{0}{/dev/ftla}{FTL on first Memory Technology Device} - \minor{16}{/dev/ftlb}{FTL on second Memory Technology Device} - \minor{32}{/dev/ftlc}{FTL on third Memory Technology Device} - \minordots - \minor{240}{/dev/ftlp}{FTL on 16th Memory Technology Device} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) expect that the partition limit is 15 rather than 63 per -disk (same as SCSI.) - -\begin{devicelist} -\major{45}{}{char }{isdn4linux ISDN BRI driver} - \minor{0}{/dev/isdn0}{First virtual B channel raw data} - \minordots - \minor{63}{/dev/isdn63}{64th virtual B channel raw data} - \minor{64}{/dev/isdnctrl0}{First channel control/debug} - \minordots - \minor{127}{/dev/isdnctrl63}{64th channel control/debug} - \minor{128}{/dev/ippp0}{First SyncPPP device} - \minordots - \minor{191}{/dev/ippp63}{64th SyncPPP device} - \minor{255}{/dev/isdninfo}{ISDN monitor interface} -\\ -\major{ }{}{block}{Parallel port IDE disk devices} - \minor{0}{/dev/pda}{First parallel port IDE disk} - \minor{16}{/dev/pdb}{Second parallel port IDE disk} - \minor{32}{/dev/pdc}{Third parallel port IDE disk} - \minor{48}{/dev/pdd}{Fourth parallel port IDE disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{46}{}{char }{Comtrol Rocketport serial card} - \minor{0}{/dev/ttyR0}{First Rocketport port} - \minor{1}{/dev/ttyR1}{Second Rocketport port} - \minordots -\\ -\major{ }{}{block}{Parallel port ATAPI CD-ROM devices} - \minor{0}{/dev/pcd0}{First parallel port ATAPI CD-ROM} - \minor{1}{/dev/pcd1}{Second parallel port ATAPI CD-ROM} - \minor{2}{/dev/pcd2}{Third parallel port ATAPI CD-ROM} - \minor{3}{/dev/pcd3}{Fourth parallel port ATAPI CD-ROM} -\end{devicelist} - -\begin{devicelist} -\major{47}{}{char }{Comtrol Rocketport serial card -- alternate devices} - \minor{0}{/dev/cur0}{Callout device corresponding to {\file ttyR0}} - \minor{1}{/dev/cur1}{Callout device corresponding to {\file ttyR1}} - \minordots -\\ -\major{ }{}{block}{Parallel port ATAPI disk devices} - \minor{0}{/dev/pf0}{First parallel port ATAPI disk} - \minor{1}{/dev/pf1}{Second parallel port ATAPI disk} - \minor{2}{/dev/pf2}{Third parallel port ATAPI disk} - \minor{3}{/dev/pf3}{Fourth parallel port ATAPI disk} -\end{devicelist} - -\noindent -This driver is intended for floppy disks and similar devices and hence -does not support partitioning. - -\begin{devicelist} -\major{48}{}{char }{SDL RISCom serial card} - \minor{0}{/dev/ttyL0}{First RISCom port} - \minor{1}{/dev/ttyL1}{Second RISCom port} - \minordots -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{49}{}{char }{SDL RISCom serial card -- alternate devices} - \minor{0}{/dev/cul0}{Callout device corresponding to {\file ttyL0}} - \minor{1}{/dev/cul1}{Callout device corresponding to {\file ttyL1}} - \minordots -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{50}{}{char}{Reserved for GLINT} -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{51}{}{char }{Baycom radio modem} - \minor{0}{/dev/bc0}{First Baycom radio modem} - \minor{1}{/dev/bc1}{Second Baycom radio modem} - \minordots -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{52}{}{char }{Spellcaster DataComm/BRI ISDN card} - \minor{0}{/dev/dcbri0}{First DataComm card} - \minor{1}{/dev/dcbri1}{Second DataComm card} - \minor{2}{/dev/dcbri2}{Third DataComm card} - \minor{3}{/dev/dcbri3}{Fourth DataComm card} -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{53}{}{char }{BDM interface for remote debugging MC683xx microcontrollers} - \minor{0}{/dev/pd\_bdm0}{PD BDM interface on {\file lp0}} - \minor{1}{/dev/pd\_bdm1}{PD BDM interface on {\file lp1}} - \minor{2}{/dev/pd\_bdm2}{PD BDM interface on {\file lp2}} - \minor{4}{/dev/icd\_bdm0}{ICD BDM interface on {\file lp0}} - \minor{5}{/dev/icd\_bdm1}{ICD BDM interface on {\file lp1}} - \minor{6}{/dev/icd\_bdm2}{ICD BDM interface on {\file lp2}} -\end{devicelist} - -\noindent -This device is used for the interfacing to the MC683xx -microcontrollers via Background Debug Mode by use of a Parallel Port -interface. PD is the Motorola Public Domain Interface and ICD is the -commercial interface by P\&E. - -\begin{devicelist} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{54}{}{char }{Electrocardiognosis Holter serial card} - \minor{0}{/dev/holter0}{First Holter port} - \minor{1}{/dev/holter1}{Second Holter port} - \minor{2}{/dev/holter2}{Third Holter port} -\end{devicelist} - -\noindent -A custom serial card used by Electrocardiognosis SRL -$<$mseritan@ottonel.pub.ro$>$ to transfer data from Holter 24-hour -heart monitoring equipment. - -\begin{devicelist} -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{55}{}{char }{DSP56001 digital signal processor} - \minor{0}{/dev/dsp56k}{First DSP56001} -\\ -\major{ }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller} -\end{devicelist} - -\begin{devicelist} -\major{56}{}{char }{Apple Desktop Bus} - \minor{0}{/dev/adb}{ADB bus control} -\end{devicelist} - -\noindent -Additional devices will be added to this number, all starting with -{\file /dev/adb}. - -\begin{devicelist} -\major{ }{}{block}{Fifth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdi}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdj}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{57}{}{char }{Hayes ESP serial card} - \minor{0}{/dev/ttyP0}{First ESP port} - \minor{1}{/dev/ttyP1}{Second ESP port} - \minordots -\\ -\major{ }{}{block}{Sixth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdk}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdl}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{58}{}{char }{Hayes ESP serial card -- alternate devices} - \minor{0}{/dev/cup0}{Callout device corresponding to {\file ttyP0}} - \minor{1}{/dev/cup1}{Callout device corresponding to {\file ttyP1}} - \minordots -\\ -\major{ }{}{block}{Reserved for logical volume manager} -\end{devicelist} - -\begin{devicelist} -\major{59}{}{char }{sf firewall package} - \minor{0}{/dev/firewall}{Communication with sf kernel module} -\end{devicelist} - -\begin{devicelist} -\major{60}{--63}{}{Local/experimental use} -\end{devicelist} - -\noindent -For devices not assigned official numbers, these ranges should be -used, in order to avoid conflict with future assignments. - -\begin{devicelist} -\major{64}{}{char }{ENskip kernel encryption package} - \minor{0}{/dev/enskip}{Communication with ENskip kernel - module} -\end{devicelist} - -\begin{devicelist} -\major{65}{}{char }{Sundance ``plink'' Transputer boards} - \minor{0}{/dev/plink0}{First plink device} - \minor{1}{/dev/plink1}{Second plink device} - \minor{2}{/dev/plink2}{Third plink device} - \minor{3}{/dev/plink3}{Fourth plink device} - \minor{64}{/dev/rplink0}{First plink device, raw} - \minor{65}{/dev/rplink1}{Second plink device, raw} - \minor{66}{/dev/rplink2}{Third plink device, raw} - \minor{67}{/dev/rplink3}{Fourth plink device, raw} - \minor{128}{/dev/plink0d}{First plink device, debug} - \minor{129}{/dev/plink1d}{Second plink device, debug} - \minor{130}{/dev/plink2d}{Third plink device, debug} - \minor{131}{/dev/plink3d}{Fourth plink device, debug} - \minor{192}{/dev/rplink0d}{First plink device, raw, debug} - \minor{193}{/dev/rplink1d}{Second plink device, raw, debug} - \minor{194}{/dev/rplink2d}{Third plink device, raw, debug} - \minor{195}{/dev/rplink3d}{Fourth plink device, raw, debug} -\end{devicelist} - -\noindent -This is a commercial driver; contact James Howes -$<$jth@prosig.demon.co.uk$>$ for information. - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (16-31)} - \minor{0}{/dev/sdq}{17th SCSI disk whole disk} - \minor{16}{/dev/sdr}{18th SCSI disk whole disk} - \minor{32}{/dev/sds}{19th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdaf}{32nd SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{66}{}{char }{YARC PowerPC PCI coprocessor card} - \minor{0}{/dev/yppcpci0}{First YARC card} - \minor{1}{/dev/yppcpci1}{Second YARC card} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (32-47)} - \minor{0}{/dev/sdag}{33rd SCSI disk whole disk} - \minor{16}{/dev/sdah}{34th SCSI disk whole disk} - \minor{32}{/dev/sdai}{35th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdav}{48th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{67}{}{char }{Coda network filesystem} - \minor{0}{/dev/cfs0}{Coda cache manager} -\end{devicelist} - -\noindent -See {\url http://www.coda.cs.cmu.edu\/} for information about Coda. - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (48-63)} - \minor{0}{/dev/sdaw}{49th SCSI disk whole disk} - \minor{16}{/dev/sdax}{50th SCSI disk whole disk} - \minor{32}{/dev/sday}{51st SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdbl}{64th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{68}{}{char }{CAPI 2.0 interface} - \minor{0}{/dev/capi20}{Control device} - \minor{1}{/dev/capi20.00}{First CAPI 2.0 application} - \minor{2}{/dev/capi20.01}{Second CAPI 2.0 application} - \minordots - \minor{20}{/dev/capi20.19}{19th CAPI 2.0 application} -\end{devicelist} - -\noindent -ISDN CAPI 2.0 driver for use with CAPI 2.0 applications; currently -supports the AVM B1 card. - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (64-79)} - \minor{0}{/dev/sdbm}{65th SCSI disk whole disk} - \minor{16}{/dev/sdbn}{66th SCSI disk whole disk} - \minor{32}{/dev/sdbo}{67th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdcb}{80th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{69}{}{char }{MA16 numeric accelerator card} - \minor{0}{/dev/ma16}{Board memory access} -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (80-95)} - \minor{0}{/dev/sdcc}{81st SCSI disk whole disk} - \minor{16}{/dev/sdcd}{82nd SCSI disk whole disk} - \minor{32}{/dev/sdce}{83th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sdcr}{96th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{70}{}{char }{SpellCaster Protocol Services Interface} - \minor{0}{/dev/apscfg}{Configuration interface} - \minor{1}{/dev/apsauth}{Authentication interface} - \minor{2}{/dev/apslog}{Logging interface} - \minor{3}{/dev/apsdbg}{Debugging interface} - \minor{64}{/dev/apsisdn}{ISDN command interface} - \minor{65}{/dev/apsasync}{Async command interface} - \minor{128}{/dev/apsmon}{Monitor interface} -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (96-111)} - \minor{0}{/dev/sdcs}{97th SCSI disk whole disk} - \minor{16}{/dev/sdct}{98th SCSI disk whole disk} - \minor{32}{/dev/sdcu}{99th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sddh}{112th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{71}{}{char }{Computone IntelliPort II serial card} - \minor{0}{/dev/ttyF0}{IntelliPort II board 0, port 0} - \minor{1}{/dev/ttyF1}{IntelliPort II board 0, port 1} - \minordots - \minor{63}{/dev/ttyF63}{IntelliPort II board 0, port 63} - \minor{64}{/dev/ttyF64}{IntelliPort II board 1, port 0} - \minor{65}{/dev/ttyF65}{IntelliPort II board 1, port 1} - \minordots - \minor{127}{/dev/ttyF127}{IntelliPort II board 1, port 63} - \minor{128}{/dev/ttyF128}{IntelliPort II board 2, port 0} - \minor{129}{/dev/ttyF129}{IntelliPort II board 2, port 1} - \minordots - \minor{191}{/dev/ttyF191}{IntelliPort II board 2, port 63} - \minor{192}{/dev/ttyF192}{IntelliPort II board 3, port 0} - \minor{193}{/dev/ttyF193}{IntelliPort II board 3, port 1} - \minordots - \minor{255}{/dev/ttyF255}{IntelliPort II board 3, port 63} -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{SCSI disk devices (112-127)} - \minor{0}{/dev/sddi}{113th SCSI disk whole disk} - \minor{16}{/dev/sddj}{114th SCSI disk whole disk} - \minor{32}{/dev/sddk}{115th SCSI disk whole disk} - \minordots - \minor{240}{/dev/sddx}{128th SCSI disk whole disk} -\end{devicelist} - -\noindent -Partitions are handled in the same way as for IDE disks (see major -number 3) except that the partition limit is 15 rather than 63 per -disk. - -\begin{devicelist} -\major{72}{}{char }{Computone IntelliPort II serial card -- alternate devices} - \minor{0}{/dev/cuf0}{Callout device corresponding to {\file ttyF0}} - \minor{1}{/dev/cuf1}{Callout device corresponding to {\file ttyF1}} - \minordots - \minor{63}{/dev/cuf63}{Callout device corresponding to {\file ttyF63}} - \minor{64}{/dev/cuf64}{Callout device corresponding to {\file ttyF64}} - \minor{65}{/dev/cuf65}{Callout device corresponding to {\file ttyF65}} - \minordots - \minor{127}{/dev/cuf127}{Callout device corresponding to {\file ttyF127}} - \minor{128}{/dev/cuf128}{Callout device corresponding to {\file ttyF128}} - \minor{129}{/dev/cuf129}{Callout device corresponding to {\file ttyF129}} - \minordots - \minor{191}{/dev/cuf191}{Callout device corresponding to {\file ttyF191}} - \minor{192}{/dev/cuf192}{Callout device corresponding to {\file ttyF192}} - \minor{193}{/dev/cuf193}{Callout device corresponding to {\file ttyF193}} - \minordots - \minor{255}{/dev/cuf255}{Callout device corresponding to {\file ttyF255}} -\end{devicelist} - -\begin{devicelist} -\major{73}{}{char }{Computone IntelliPort II serial card -- control devices} - \minor{0}{/dev/ip2ipl0}{Loadware device for board 0} - \minor{1}{/dev/ip2stat0}{Status device for board 0} - \minor{4}{/dev/ip2ipl1}{Loadware device for board 1} - \minor{5}{/dev/ip2stat1}{Status device for board 1} - \minor{8}{/dev/ip2ipl2}{Loadware device for board 2} - \minor{9}{/dev/ip2stat2}{Status device for board 2} - \minor{12}{/dev/ip2ipl3}{Loadware device for board 3} - \minor{13}{/dev/ip2stat3}{Status device for board 3} -\end{devicelist} - -\begin{devicelist} -\major{74}{}{char }{SCI bridge} - \minor{0}{/dev/SCI/0}{SCI device 0} - \minor{1}{/dev/SCI/1}{SCI device 1} - \minordots -\end{devicelist} - -\noindent -Currently for Dolphin Interconnect Solutions' PCI-SCI bridge. - -\begin{devicelist} -\major{75}{}{char }{Specialix IO8+ serial card} - \minor{0}{/dev/ttyW0}{First IO8+ port, first card} - \minor{1}{/dev/ttyW1}{Second IO8+ port, first card} - \minordots - \minor{8}{/dev/ttyW8}{First IO8+ port, second card} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{76}{}{char }{Specialix IO8+ serial card -- alternate devices} - \minor{0}{/dev/cuw0}{Callout device corresponding to {\file ttyW0}} - \minor{1}{/dev/cuw1}{Callout device corresponding to {\file ttyW1}} - \minordots - \minor{8}{/dev/cuw8}{Callout device corresponding to {\file ttyW8}} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{77}{}{char }{ComScire Quantum Noise Generator} - \minor{0}{/dev/qng}{ComScire Quantum Noise Generator} -\end{devicelist} - -\begin{devicelist} -\major{78}{}{char }{PAM Software's multimodem boards} - \minor{0}{/dev/ttyM0}{First PAM modem} - \minor{1}{/dev/ttyM1}{Second PAM modem} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{79}{}{char }{PAM Software's multimodem boards -- alternate devices} - \minor{0}{/dev/cum0}{Callout device corresponding to {\file ttyM0}} - \minor{1}{/dev/cum1}{Callout device corresponding to {\file ttyM1}} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{80}{}{char }{Photometrics AT200 CCD camera} - \minor{0}{/dev/at200}{Photometrics AT200 CCD camera} -\end{devicelist} - -\begin{devicelist} -\major{81}{}{char }{video4linux} - \minor{0}{/dev/video0}{Video capture/overlay device} - \minordots - \minor{63}{/dev/video63}{Video capture/overlay device} - \minor{64}{/dev/radio0}{Radio device} - \minordots - \minor{127}{/dev/radio63}{Radio device} - \minor{192}{/dev/vtx0}{Teletext device} - \minordots - \minor{223}{/dev/vtx31}{Teletext device} - \minor{224}{/dev/vbi0}{Vertical blank interupt} - \minordots - \minor{255}{/dev/vbi31}{Vertical blank interupt} -\end{devicelist} - -\begin{devicelist} -\major{82}{}{char }{WiNRADiO communications receiver card} - \minor{0}{/dev/winradio0}{First WiNRADiO card} - \minor{1}{/dev/winradio1}{Second WiNRADiO card} - \minordots -\end{devicelist} - -\noindent -The driver and documentation may be obtained from -{\url http://www.proximity.com.au/~brian/winradio/\/}. - -\begin{devicelist} -\major{83}{}{char }{Teletext/videotext interfaces} - \minor{0}{/dev/vtx}{Teletext decoder} - \minor{16}{/dev/vttuner}{TV tuner on teletext interface} -\end{devicelist} - -\noindent -Devices for the driver contained in the VideoteXt package. More information -on {\url http://home.pages.de/~videotext/\/}. - -\begin{devicelist} -\major{84}{}{char }{Ikon 1011[57] Versatec Greensheet Interface} - \minor{0}{/dev/ihcp0}{First Greensheet port} - \minor{1}{/dev/ihcp1}{Second Greensheet port} -\end{devicelist} - -\begin{devicelist} -\major{85}{}{char }{Linux/SGI shared memory input queue} - \minor{0}{/dev/shmiq}{Master shared input queue} - \minor{1}{/dev/qcntl0}{First device pushed} - \minor{2}{/dev/qcntl1}{Second device pushed} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{86}{}{char }{SCSI media changer} - \minor{0}{/dev/sch0}{First SCSI media changer} - \minor{1}{/dev/sch1}{Second SCSI media changer} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{87}{}{char }{Sony Control-A1 stereo control bus} - \minor{0}{/dev/controla0}{First device on chain} - \minor{1}{/dev/controla1}{Second device on chain} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{88}{}{char }{COMX synchronous serial card} - \minor{0}{/dev/comx0}{Channel 0} - \minor{1}{/dev/comx1}{Channel 1} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{Seventh IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdm}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdn}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{89}{}{char }{I$^2$C bus interface} - \minor{0}{/dev/i2c0}{First I$^2$C adapter} - \minor{1}{/dev/i2c1}{Second I$^2$C adapter} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{Eighth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdo}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdp}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)} - \minor{0}{/dev/mtd0}{First MTD (rw)} - \minor{1}{/dev/mtdr0}{First MTD (ro)} - \minordots - \minor{30}{/dev/mtd15}{16th MTD (rw)} - \minor{31}{/dev/mtdr15}{16th MTD (ro)} -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{Ninth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hdq}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdr}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{91}{}{char }{CAN-Bus controller} - \minor{0}{/dev/can0}{First CAN-Bus controller} - \minor{1}{/dev/can1}{Second CAN-Bus controller} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{ }{}{block}{Tenth IDE hard disk/CD-ROM interface} - \minor{0}{/dev/hds}{Master: whole disk (or CD-ROM)} - \minor{64}{/dev/hdt}{Slave: whole disk (or CD-ROM)} -\end{devicelist} - -\noindent -Partitions are handled the same way as for the first interface (see -major number 3). - -\begin{devicelist} -\major{92}{}{char }{Reserved for ith Kommunikationstechnik MIC ISDN card} -\end{devicelist} - -\begin{devicelist} -\major{93}{}{char }{IBM Smart Capture Card frame grabber} - \minor{0}{/dev/iscc0}{First Smart Capture Card} - \minor{1}{/dev/iscc1}{Second Smart Capture Card} - \minordots - \minor{128}{/dev/isccctl0}{First Smart Capture Card control} - \minor{129}{/dev/isccctl1}{Second Smart Capture Card control} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{94}{}{char }{miroVIDEO DC10/30 capture/playback device} - \minor{0}{/dev/dcxx0}{First capture card} - \minor{1}{/dev/dcxx1}{Second capture card} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{95}{}{char }{IP filter} - \minor{0}{/dev/ipl}{Filter control device/log file} - \minor{1}{/dev/ipnat}{NAT control device/log file} - \minor{2}{/dev/ipstate}{State information log file} - \minor{3}{/dev/ipauth}{Authentication control device/log file} -\end{devicelist} - -\begin{devicelist} -\major{96}{}{char }{Parallel port ATAPI tape devices} - \minor{0}{/dev/pt0}{First parallel port ATAPI tape} - \minor{1}{/dev/pt1}{Second parallel port ATAPI tape} - \minor{2}{/dev/pt2}{Third parallel port ATAPI tape} - \minor{3}{/dev/pt3}{Fourth parallel port ATAPI tape} - \minor{128}{/dev/npt0}{First parallel port ATAPI tape, no rewind} - \minor{129}{/dev/npt1}{Second parallel port ATAPI tape, no rewind} - \minor{130}{/dev/npt2}{Third parallel port ATAPI tape, no rewind} - \minor{131}{/dev/npt3}{Fourth parallel port ATAPI tape, no rewind} -\end{devicelist} - -\begin{devicelist} -\major{97}{}{char }{Parallel port generic ATAPI interface} - \minor{0}{/dev/pg0}{First parallel port ATAPI device} - \minor{1}{/dev/pg1}{Second parallel port ATAPI device} - \minor{2}{/dev/pg2}{Third parallel port ATAPI device} - \minor{3}{/dev/pg3}{Fourth parallel port ATAPI device} -\end{devicelist} - -\noindent -These devices support the same API as the generic SCSI devices. - -\begin{devicelist} -\major{98}{}{char }{Control and Mesurement Device (comedi)} - \minor{0}{/dev/comedi0}{First comedi device} - \minor{1}{/dev/comedi1}{Second comedi device} - \minordots -\end{devicelist} - -\noindent -See {\url http://stm.lbl.gov/comedi/} or {\url -http://www.llp.fu-berlin.de/}. - -\begin{devicelist} -\major{99}{}{char }{Raw parallel ports} - \minor{0}{/dev/parport0}{First parallel port} - \minor{1}{/dev/parport1}{Second parallel port} - \minordots -\end{devicelist} - -\noindent -These devices can be used to drive parallel port devices from -user-space while interacting with the parport sharing code. - -\begin{devicelist} -\major{100}{}{char }{POTS (analogue telephone) A/B port} - \minor{0}{/dev/phone0}{First telephone port} - \minor{1}{/dev/phone1}{Second telephone port} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{101}{}{char }{Motorola DSP 56xxx board} - \minor{0}{/dev/mdspstat}{Status information} - \minor{1}{/dev/mdsp1}{First DSP board I/O and controls} - \minordots - \minor{16}{/dev/mdsp16}{16th DSP board I/O and controls} -\end{devicelist} - -\begin{devicelist} -\major{102}{}{char }{Philips SAA5249 Teletext signal decoder} - \minor{0}{/dev/tlk0}{First Teletext decoder} - \minor{1}{/dev/tlk1}{Second Teletext decoder} - \minor{2}{/dev/tlk2}{Third Teletext decoder} - \minor{3}{/dev/tlk3}{Fourth Teletext decoder} -\end{devicelist} - -\begin{devicelist} -\major{103}{}{char }{Arla network file system} - \minor{0}{/dev/xfs0}{Arla XFS} -\end{devicelist} - -\noindent -Arla is a free clone of the Andrew File System, AFS. Any resemblance -with the Swedish milk producer is coincidental. For more information -about the project, write to $<$arla-drinkers@stacken.kth.se$>$ or -subscribe to the arla-announce mailing list by sending a mail to -$<$arla-announce-request@stacken.kth.se$>$. - -\begin{devicelist} -\major{104}{}{char }{Flash BIOS support} -\end{devicelist} - -\begin{devicelist} -\major{105}{}{char }{Comtrol VS-1000 serial card} - \minor{0}{/dev/ttyV0}{First VS-1000 port} - \minor{1}{/dev/ttyV1}{Second VS-1000 port} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{106}{}{char }{Comtrol VS-1000 serial card -- alternate devices} - \minor{0}{/dev/cuv0}{Callout device corresponding to {\file ttyV0}} - \minor{1}{/dev/cuv1}{Callout device corresponding to {\file ttyV1}} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{107}{}{char }{3Dfx Voodoo Graphics device} - \minor{0}{/dev/3dfx}{Primary 3Dfx graphics device} -\end{devicelist} - -\begin{devicelist} -\major{108}{}{char }{Device independent PPP interface} - \minor{0}{/dev/ppp}{Device independent PPP interface} -\end{devicelist} - -\begin{devicelist} -\major{109}{}{char }{Reserved for logical volume manager} -\end{devicelist} - -\begin{devicelist} -\major{110}{}{char }{miroMEDIA Surround board} - \minor{0}{/dev/srnd0}{First miroMEDIA Surround board} - \minor{1}{/dev/srnd1}{First miroMEDIA Surround board} - \minordots -\end{devicelist} - -\begin{devicelist} -\major{111}{--119}{}{Unallocated} -\end{devicelist} - -\begin{devicelist} -\major{120}{--127}{}{Local/experimental use} -\end{devicelist} - -\begin{devicelist} -\major{128}{--135}{char }{Unix98 PTY masters} -\end{devicelist} - -\noindent -These devices should not have corresponding device nodes; instead they -should be accessed through the {\file /dev/ptmx} cloning device. - -\begin{devicelist} -\major{136}{--143}{char }{Unix98 PTY slaves} - \minor{0}{/dev/pts/0}{First Unix98 pseudo-TTY} - \minor{1}{/dev/pts/1}{Second Unix98 pseudo-TTY} - \minordots -\end{devicelist} - -\noindent -These device nodes are automatically generated with the proper -permissions and modes by mounting the {\file devpts} filesystem onto -{\file /dev/pts} with the appropriate mount options (distribution -dependent.) - -\begin{devicelist} -\major{144}{--239}{}{Unallocated} -\end{devicelist} - -\begin{devicelist} -\major{240}{--254}{}{Local/experimental use} -\end{devicelist} - -\begin{devicelist} -\major{255}{}{}{Reserved} -\end{devicelist} - -\noindent -This major is reserved to assist the expansion to a larger number -space. No device nodes with this major should ever be created on any -filesystem. - -\section{Additional /dev directory entries} - -This section details additional entries that should or may exist in the -{\file /dev} directory. It is preferred that symbolic links use the -same form (absolute or relative) as is indicated here. Links are -classified as {\em hard\/} or {\em symbolic\/} depending on the -preferred type of link; if possible, the indicated type of link should -be used. - -\subsection{Compulsory links} - -These links should exist on all systems: - -\begin{nodelist} -\link{/dev/fd}{/proc/self/fd}{symbolic}{File descriptors} -\link{/dev/stdin}{fd/0}{symbolic}{Standard input file descriptor} -\link{/dev/stdout}{fd/1}{symbolic}{Standard output file descriptor} -\link{/dev/stderr}{fd/2}{symbolic}{Standard error file descriptor} -\link{/dev/nfsd}{socksys}{symbolic}{Required by iBCS-2} -\link{/dev/X0R}{null}{symbolic}{Required by iBCS-2} -\end{nodelist} - -\noindent -Note: The last device is: $<$letter {\tt X}$>$-$<$digit {\tt -0}$>$-$<$letter {\tt R}$>$. - -\subsection{Recommended links} - -It is recommended that these links exist on all systems: - -\begin{nodelist} -\link{/dev/core}{/proc/kcore}{symbolic}{Backward compatibility} -\link{/dev/ramdisk}{ram0}{symbolic}{Backward compatibility} -\link{/dev/ftape}{qft0}{symbolic}{Backward compatibility} -\link{/dev/bttv0}{video0}{symbolic}{Backward compatibility} -\link{/dev/radio}{radio0}{symbolic}{Backward compatibility} -\link{/dev/scd?}{sr?}{hard}{Alternate name for CD-ROMs} -\end{nodelist} - -\subsection{Locally defined links} - -The following links may be established locally to conform to the -configuration of the system. This is merely a tabulation of existing -practice, and does not constitute a recommendation. However, if they -exist, they should have the following uses. - -\begin{nodelist} -\vlink{/dev/mouse}{mouse port}{symbolic}{Current mouse device} -\vlink{/dev/tape}{tape device}{symbolic}{Current tape device} -\vlink{/dev/cdrom}{CD-ROM device}{symbolic}{Current CD-ROM device} -\vlink{/dev/cdwriter}{CD-writer}{symbolic}{Current CD-writer device} -\vlink{/dev/scanner}{scanner device}{symbolic}{Current scanner device} -\vlink{/dev/modem}{modem port}{symbolic}{Current dialout device} -\vlink{/dev/root}{root device}{symbolic}{Current root filesystem} -\vlink{/dev/swap}{swap device}{symbolic}{Current swap device} -\end{nodelist} - -\noindent -{\file /dev/modem} should not be used for a modem which supports -dialin as well as dialout, as it tends to cause lock file problems. -If it exists, {\file /dev/modem} should point to the appropriate -primary TTY device (the use of the alternate callout devices is -deprecated.) - -For SCSI devices, {\file /dev/tape} and {\file /dev/cdrom} should -point to the ``cooked'' devices ({\file /dev/st*} and {\file -/dev/sr*}, respectively), whereas {\file /dev/cdwriter} and {\file -/dev/scanner} should point to the appropriate generic SCSI devices -({\file /dev/sg*}). - -{\file /dev/mouse} may point to a primary serial TTY device, a -hardware mouse device, or a socket for a mouse driver program -(e.g. {\file /dev/gpmdata}). - -\subsection{Sockets and pipes} - -Non-transient sockets or named pipes may exist in {\file /dev}. -Common entries are: - -\begin{nodelist} -\node{/dev/printer}{socket}{{\file lpd} local socket} -\node{/dev/log}{socket}{{\file syslog} local socket} -\node{/dev/gpmdata}{socket}{{\file gpm} mouse multiplexer} -\end{nodelist} - -\section{Terminal devices} - -Terminal, or TTY devices are a special class of character devices. A -terminal device is any device that could act as a controlling terminal -for a session; this includes virtual consoles, serial ports, and -pseudoterminals (PTYs). - -All terminal devices share a common set of capabilities known as line -diciplines; these include the common terminal line dicipline as well -as SLIP and PPP modes. - -All terminal devices are named similarly; this section explains the -naming and use of the various types of TTYs. Note that the naming -conventions include several historical warts; some of these are -Linux-specific, some were inherited from other systems, and some -reflect Linux outgrowing a borrowed convention. - -A hash mark ($\#$) in a device name is in all cases used here to -indicate a decimal number without leading zeroes. - -\subsection{Virtual consoles and the console device} - -Virtual consoles are full-screen terminal displays on the system video -monitor. Virtual consoles are named {\file /dev/tty$\#$}, with -numbering starting at {\file /dev/tty1}; {\file /dev/tty0} is the -current virtual console. {\file /dev/tty0} is the device that should -be used to access the system video card on those architectures for -which the frame buffer devices ({\file /dev/fb*}) are not applicable. -Do not use {\file /dev/console} for this purpose. - -The {\em console device\/}, {\file /dev/console}, is the device to -which system messages should be sent, and on which logins should be -permitted in single-user mode. Starting with Linux 2.1.71, {\file -/dev/console} is managed by the kernel; for previous versions it -should be a symbolic link to either {\file /dev/tty0}, a specific -virtual console such as {\file /dev/tty1}, or to a serial port primary -({\file tty*}, not {\file cu*}) device, depending on the configuration -of the system. - -\subsection{Serial ports} - -Serial ports are RS-232 serial ports and any device which simulates -one, either in hardware (such as internal modems) or in software (such -as the ISDN driver.) Under Linux, each serial ports has two device -names, the primary or callin device and the alternate or callout one. -Each kind of device is indicated by a different letter. For any -letter $X$, the names of the devices are {\file /dev/tty${X\#}$} and -{\file /dev/cu${x\#}$}, respectively; for historical reasons, {\file -/dev/ttyS$\#$} and {\file /dev/ttyC$\#$} correspond to {\file -/dev/cua$\#$} and {\file /dev/cub$\#$}. In the future, it should be -expected that multiple letters will be used; all letters will be upper -case for the {\file tty} device (e.g. {\file /dev/ttyDP$\#$} and lower -case for the {\file cu} device (e.g. {\file /dev/cudp$\#$}. - -The use of the callout devices is deprecated. - -The names {\file /dev/ttyQ$\#$} and {\file /dev/cuq$\#$} are reserved -for local use. - -The alternate devices provide for kernel-based exclusion and somewhat -different defaults than the primary devices. Their main purpose is to -allow the use of serial ports with programs with no inherent or broken -support for serial ports. Their use is deprecated, and they may be -removed from a future version of Linux. - -Arbitration of serial ports is provided by the use of lock files with -the names {\file /var/lock/LCK..tty${X\#}$}. The contents of the lock -file should be the PID of the locking process as an ASCII number. - -It is common practice to install links such as {\file /dev/modem\/} -which point to serial ports. In order to ensure proper locking in the -presence of these links, it is recommended that software chase -symlinks and lock all possible names; additionally, it is recommended -that a lock file be installed with the corresponding alternate -device. In order to avoid deadlocks, it is recommended that the locks -are acquired in the following order, and released in the reverse: -\begin{itemize} -\item{The symbolic link name, if any ({\file /var/lock/LCK..modem})} -\item{The {\file tty} name ({\file /var/lock/LCK..ttyS2})} -\item{The alternate device name ({\file /var/lock/LCK..cua2})} -\end{itemize} -In the case of nested symbolic links, the lock files should be -installed in the order the symlinks are resolved. - -Under no circumstances should an application hold a lock while waiting -for another to be released. In addition, applications which attempt -to create lock files for the corresponding alternate device names -should take into account the possibility of being used on a non-serial -port TTY, for which no alternate device would exist. - -\subsection{Pseudoterminals (PTYs)} - -Pseudoterminals, or PTYs, are used to create login sessions or provide -other capabilities requiring a TTY line dicipline (including SLIP or -PPP capability) to arbitrary data-generation processes. Each PTY has -a {\em master\/} side, named {\file /dev/pty[p-za-e][0-9a-f]\/}, and a -{\em slave\/} side, named {\file /dev/tty[p-za-e][0-9a-f]\/}. The -kernel arbitrates the use of PTYs by allowing each master side to be -opened only once. - -Once the master side has been opened, the corresponding slave device -can be used in the same manner as any TTY device. The master and -slave devices are connected by the kernel, generating the equivalent -of a bidirectional pipe with TTY capabilities. - -Recent versions of the Linux kernels and GNU libc contain support for -the System V/Unix98 naming scheme for PTYs, which assigns a common -device {\file /dev/ptmx\/} to all the masters (opening it will -automatically give you a previously unassigned PTY) and a subdirectory -{\file /dev/pts\/} for the slaves; the slaves are named with decimal -integers ({\file /dev/pts/$\#$\/} in our notation). This removes the -problem of exhausting the namespace and enables the kernel to -automatically create the device nodes for the slaves on demand using -the {\file devpts\/} filesystem. - -\end{document} diff --git a/Documentation/devices.txt b/Documentation/devices.txt index c17b7718897d..6332b478edf8 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt @@ -1,7 +1,7 @@ LINUX ALLOCATED DEVICES Maintained by H. Peter Anvin - Last revised: December 16, 1999 + Last revised: March 23, 2000 This list is the Linux Device List, the official registry of allocated device numbers and /dev directory nodes for the Linux operating @@ -14,12 +14,15 @@ ftp://ftp.kernel.org/pub/linux/docs/device-list/. The LaTeX version of this document is no longer maintained. This document is included by reference into the Filesystem Hierarchy -Standard (FHS). The FHS is available from http://www.pathname.com/fhs/. +Standard (FHS). The FHS is available from http://www.pathname.com/fhs/. Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga platform only. Allocations marked (68k/Atari) apply to Linux/68k on the Atari platform only. +The symbol {2.6} means the allocation is obsolete and scheduled for +removal once kernel version 2.6 (or equivalent) is released. + This document is in the public domain. The author requests, however, that semantically altered versions are not distributed without permission of the author, assuming the author can be contacted without @@ -198,7 +201,7 @@ Your cooperation is appreciated. Older versions of the Linux kernel used this major number for BSD PTY devices. As of Linux 2.1.115, this - is no longer supported. Use major numbers 2 and 3. + is no longer supported. Use major numbers 2 and 3. 5 char Alternate TTY devices 0 = /dev/tty Current TTY device @@ -304,8 +307,11 @@ Your cooperation is appreciated. 7 = /dev/amigamouse1 Second Amiga mouse 8 = /dev/smouse Simple serial mouse driver 9 = /dev/pc110pad IBM PC-110 digitizer pad + 10 = /dev/adbmouse Apple Desktop Bus mouse + 11 = /dev/vrtpanel Vr41xx embedded touch panel + 13 = /dev/vpcmouse Connectix Virtual PC Mouse 128 = /dev/beep Fancy beep device - 129 = /dev/modreq Kernel module load request + 129 = /dev/modreq Kernel module load request {2.6} 130 = /dev/watchdog Watchdog timer port 131 = /dev/temperature Machine internal temperature 132 = /dev/hwtrap Hardware fault trap @@ -318,7 +324,7 @@ Your cooperation is appreciated. 142 = /dev/msr x86 model-specific registers 143 = /dev/pciconf PCI configuration space 144 = /dev/nvram Non-volatile configuration RAM - 145 = /dev/hfmodem Soundcard shortwave modem control + 145 = /dev/hfmodem Soundcard shortwave modem control {2.6} 146 = /dev/graphics Linux/SGI graphics device 147 = /dev/opengl Linux/SGI OpenGL pipe 148 = /dev/gfx Linux/SGI graphics effects device @@ -352,6 +358,11 @@ Your cooperation is appreciated. 177 = /dev/cbm Serial CBM bus 178 = /dev/jsflash JavaStation OS flash SIMM 179 = /dev/xsvc High-speed shared-mem/semaphore service + 180 = /dev/vrbuttons Vr41xx button input device + 181 = /dev/toshiba Toshiba laptop SMM support + 182 = /dev/perfctr Performance-monitoring counters + 183 = /dev/intel_rng Intel i8x0 random number generator + 184 = /dev/cpu/microcode CPU microcode update interface 240-255 Reserved for local use 11 char Raw keyboard device @@ -380,7 +391,7 @@ Your cooperation is appreciated. The device names specified are proposed -- if there are "standard" names for these devices, please let me know. - block MSCDEX CD-ROM callback support + block MSCDEX CD-ROM callback support {2.6} 0 = /dev/dos_cd0 First MSCDEX CD-ROM 1 = /dev/dos_cd1 Second MSCDEX CD-ROM ... @@ -407,7 +418,7 @@ Your cooperation is appreciated. 2 = /dev/midi00 First MIDI port 3 = /dev/dsp Digital audio 4 = /dev/audio Sun-compatible digital audio - 6 = /dev/sndstat Sound card status information + 6 = /dev/sndstat Sound card status information {2.6} 7 = /dev/audioctl SPARC audio control device 8 = /dev/sequencer2 Sequencer -- alternate device 16 = /dev/mixer1 Second soundcard mixer control @@ -418,7 +429,7 @@ Your cooperation is appreciated. 33 = /dev/patmgr1 Sequencer patch manager 34 = /dev/midi02 Third MIDI port 50 = /dev/midi03 Fourth MIDI port - block BIOS harddrive callback support + block BIOS harddrive callback support {2.6} 0 = /dev/dos_hda First BIOS harddrive whole disk 64 = /dev/dos_hdb Second BIOS harddrive whole disk 128 = /dev/dos_hdc Third BIOS harddrive whole disk @@ -549,7 +560,7 @@ Your cooperation is appreciated. 2 = /dev/sbpcd2 Panasonic CD-ROM controller 0 unit 2 3 = /dev/sbpcd3 Panasonic CD-ROM controller 0 unit 3 - 26 char Quanta WinVision frame grabber + 26 char Quanta WinVision frame grabber {2.6} 0 = /dev/wvisfgrab Quanta WinVision frame grabber block Second Matsushita (Panasonic/SoundBlaster) CD-ROM 0 = /dev/sbpcd4 Panasonic CD-ROM controller 1 unit 0 @@ -569,7 +580,7 @@ Your cooperation is appreciated. 16 = /dev/zqft0 Unit 0, rewind-on-close, compression 17 = /dev/zqft1 Unit 1, rewind-on-close, compression 18 = /dev/zqft2 Unit 2, rewind-on-close, compression - 19 = /dev/zqtf3 Unit 3, rewind-on-close, compression + 19 = /dev/zqft3 Unit 3, rewind-on-close, compression 20 = /dev/nzqft0 Unit 0, no rewind-on-close, compression 21 = /dev/nzqft1 Unit 1, no rewind-on-close, compression 22 = /dev/nzqft2 Unit 2, no rewind-on-close, compression @@ -613,12 +624,11 @@ Your cooperation is appreciated. disks (see major number 3) except that the limit on partitions is 15, like SCSI. - 29 char Universal frame buffers + 29 char Universal frame buffer 0 = /dev/fb0 First frame buffer - 1 = /dev/fb1 Second frame buffer - 2 = /dev/fb2 Third frame buffer + 32 = /dev/fb1 Second frame buffer ... - 31 = /dev/fb31 32nd frame buffer + 224 = /dev/fb7 Eighth frame buffer All additional minor numbers are reserved. @@ -777,7 +787,7 @@ Your cooperation is appreciated. ... block Reserved for Linux/AP+ - 40 char Matrox Meteor frame grabber + 40 char Matrox Meteor frame grabber {2.6} 0 = /dev/mmetfgrab Matrox Meteor frame grabber block Syquest EZ135 parallel port removable drive 0 = /dev/eza Parallel EZ135 drive, whole disk @@ -1265,7 +1275,7 @@ Your cooperation is appreciated. disks (see major number 3) except that the limit on partitions is 15. - 83 char Teletext/videotext interfaces + 83 char Teletext/videotext interfaces {2.6} 0 = /dev/vtx Teletext decoder 16 = /dev/vttuner TV tuner on teletext interface @@ -1356,8 +1366,8 @@ Your cooperation is appreciated. 89 char I2C bus interface - 0 = /dev/i2c0 First I2C adapter - 1 = /dev/i2c1 Second I2C adapter + 0 = /dev/i2c-0 First I2C adapter + 1 = /dev/i2c-1 Second I2C adapter ... block Eighth IDE hard disk/CD-ROM interface @@ -1404,7 +1414,7 @@ Your cooperation is appreciated. disks (see major number 3) except that the limit on partitions is 15. - 93 char IBM Smart Capture Card frame grabber + 93 char IBM Smart Capture Card frame grabber {2.6} 0 = /dev/iscc0 First Smart Capture Card 1 = /dev/iscc1 Second Smart Capture Card ... @@ -1418,7 +1428,7 @@ Your cooperation is appreciated. ... 240 = /dev/nftlp 16th NTFL layer - 94 char miroVIDEO DC10/30 capture/playback device + 94 char miroVIDEO DC10/30 capture/playback device {2.6} 0 = /dev/dcxx0 First capture card 1 = /dev/dcxx1 Second capture card ... @@ -1462,6 +1472,11 @@ Your cooperation is appreciated. These devices support the same API as the generic SCSI devices. + block Packet writing for CD/DVD devices + 0 = /dev/pktcdvd0 First packet-writing module + 1 = /dev/pktcdvd1 Second packet-writing module + ... + 98 char Control and Measurement Device (comedi) 0 = /dev/comedi0 First comedi device 1 = /dev/comedi1 Second comedi device @@ -1469,23 +1484,34 @@ Your cooperation is appreciated. See http://stm.lbl.gov/comedi or http://www.llp.fu-berlin.de/. + block User-mode virtual block device + 0 = /dev/ubd0 First user-mode block device + 1 = /dev/ubd1 Second user-mode block device + ... + + This device is used by the user-mode virtual kernel port. + 99 char Raw parallel ports 0 = /dev/parport0 First parallel port 1 = /dev/parport1 Second parallel port ... -100 char POTS (analogue telephone) A/B port +100 char POTS (analogue telephone) A/B port {2.6} 0 = /dev/phone0 First telephone port 1 = /dev/phone1 Second telephone port ... + The names have been reallocated to Telephony For + Linux, major 159. All use of major 100 should be + considered legacy and deprecated. + 101 char Motorola DSP 56xxx board 0 = /dev/mdspstat Status information 1 = /dev/mdsp1 First DSP board I/O controls ... 16 = /dev/mdsp16 16th DSP board I/O controls -102 char Philips SAA5249 Teletext signal decoder +102 char Philips SAA5249 Teletext signal decoder {2.6} 0 = /dev/tlk0 First Teletext decoder 1 = /dev/tlk1 Second Teletext decoder 2 = /dev/tlk2 Third Teletext decoder @@ -1526,7 +1552,7 @@ Your cooperation is appreciated. 1 = /dev/srnd1 Second miroMEDIA Surround board ... -111 char Philips SAA7146-based audio/video card +111 char Philips SAA7146-based audio/video card {2.6} 0 = /dev/av0 First A/V card 1 = /dev/av1 Second A/V card ... @@ -1562,7 +1588,7 @@ Your cooperation is appreciated. Plays music using IBM BASIC style strings. -116 char Advanced Linux System Driver (ALSA) +116 char Advanced Linux Sound Driver (ALSA) 117 char COSA/SRP synchronous serial card 0 = /dev/cosa0c0 1st board, 1st channel @@ -1691,9 +1717,9 @@ Your cooperation is appreciated. 1 = /dev/gfax1 GammaLink channel 1 ... -159 char Quicknet Technologies Internet PhoneJack/LineJack - 0 = /dev/ixj0 First device - 1 = /dev/ixj1 Second device +159 char Telephony for Linux + 0 = /dev/phone0 First telephony device + 1 = /dev/phone1 Second telephony device ... 160 char General Purpose Instrument Bus (GPIB) @@ -1735,9 +1761,9 @@ Your cooperation is appreciated. 63 = /dev/ttyCH63 AT/PCI-Fast board 3, port 15 165 char Chase Research AT/PCI-Fast serial card - alternate devices - 0 = /dev/cuch0 Callout device corresponding to ttyCH0 + 0 = /dev/cuch0 Callout device for ttyCH0 ... - 63 = /dev/cuch63 Callout device corresponding to ttyCH63 + 63 = /dev/cuch63 Callout device for ttyCH63 166 char ACM USB modems 0 = /dev/ttyACM0 First ACM modem @@ -1796,13 +1822,13 @@ Your cooperation is appreciated. ... 177 char TI PCILynx memory spaces - 0 = /dev/pcilynx/aux0 AUX space of first PCILynx card + 0 = /dev/pcilynx/aux0 AUX space of first PCILynx card ... 15 = /dev/pcilynx/aux15 AUX space of 16th PCILynx card - 16 = /dev/pcilynx/rom0 ROM space of first PCILynx card + 16 = /dev/pcilynx/rom0 ROM space of first PCILynx card ... 31 = /dev/pcilynx/rom15 ROM space of 16th PCILynx card - 32 = /dev/pcilynx/ram0 RAM space of first PCILynx card + 32 = /dev/pcilynx/ram0 RAM space of first PCILynx card ... 47 = /dev/pcilynx/ram15 RAM space of 16th PCILynx card @@ -1829,6 +1855,7 @@ Your cooperation is appreciated. 48 = /dev/usb/scanner0 First USB scanner ... 63 = /dev/usb/scanner15 16th USB scanner + 64 = /dev/usb/rio500 Diamond Rio 500 181 char Conrad Electronic parallel port radio clocks 0 = /dev/pcfclock0 First Conrad radio clock @@ -1836,7 +1863,7 @@ Your cooperation is appreciated. ... 182 char Picture Elements THR2 binarizer - 0 = /dev/pethr0 First THR2 board + 0 = /dev/pethr0 First THR2 board 1 = /dev/pethr1 Second THR2 board ... @@ -1853,7 +1880,12 @@ Your cooperation is appreciated. 1 = /dev/pevss1 Second sender board ... -185 char Reserved for InterMezzo high availability file system +185 char InterMezzo high availability file system + 0 = /dev/intermezzo0 First cache manager + 1 = /dev/intermezzo1 Second cache manager + ... + + See http://www.inter-mezzo.org/ for more information. 186 char Object-based storage control device 0 = /dev/obd0 First obd control device @@ -1862,7 +1894,10 @@ Your cooperation is appreciated. See ftp://ftp.lustre.org/pub/obd for code and information. -187 char UNALLOCATED +187 char DESkey hardware encryption device + 0 = /dev/deskey0 First DES key + 1 = /dev/deskey1 Second DES key + ... 188 char USB serial converters 0 = /dev/ttyUSB0 First USB serial converter @@ -1870,11 +1905,46 @@ Your cooperation is appreciated. ... 189 char USB serial converters - alternate devices - 0 = /dev/cuusb0 Callout device corresponding to ttyUSB0 - 1 = /dev/cuusb1 Callout device corresponding to ttyUSB1 + 0 = /dev/cuusb0 Callout device for ttyUSB0 + 1 = /dev/cuusb1 Callout device for ttyUSB1 ... -190-239 UNALLOCATED +190 char Kansas City tracker/tuner card + 0 = /dev/kctt0 First KCT/T card + 1 = /dev/kctt1 Second KCT/T card + ... + +191 char Reserved for PCMCIA + +192 char Kernel profiling interface + 0 = /dev/profile Profiling control device + 1 = /dev/profile0 Profiling device for CPU 0 + 2 = /dev/profile1 Profiling device for CPU 1 + ... + +193 char Kernel event-tracing interface + 0 = /dev/trace Tracing control device + 1 = /dev/trace0 Tracing device for CPU 0 + 2 = /dev/trace1 Tracing device for CPU 1 + ... + +194 char linVideoStreams (LINVS) + 0 = /dev/mvideo/status0 Video compression status + 1 = /dev/mvideo/stream0 Video stream + 2 = /dev/mvideo/frame0 Single compressed frame + 3 = /dev/mvideo/rawframe0 Raw uncompressed frame + 4 = /dev/mvideo/codec0 Direct codec access + 5 = /dev/mvideo/video4linux0 Video4Linux compatibility + + 16 = /dev/mvideo/status1 Second device + ... + 32 = /dev/mvideo/status2 Third device + ... + ... + 240 = /dev/mvideo/status15 16th device + ... + +195-239 UNALLOCATED 240-254 LOCAL/EXPERIMENTAL USE @@ -1903,7 +1973,6 @@ These links should exist on all systems: /dev/stderr fd/2 symbolic stderr file descriptor /dev/nfsd socksys symbolic Required by iBCS-2 /dev/X0R null symbolic Required by iBCS-2 -/dev/i2o* /dev/i2o/* symbolic Backward compatibility Note: /dev/X0R is --. @@ -1916,6 +1985,7 @@ It is recommended that these links exist on all systems: /dev/ftape qft0 symbolic Backward compatibility /dev/bttv0 video0 symbolic Backward compatibility /dev/radio radio0 symbolic Backward compatibility +/dev/i2o* /dev/i2o/* symbolic Backward compatibility /dev/scd? sr? hard Alternate SCSI CD-ROM name Locally defined links @@ -1983,7 +2053,7 @@ monitor. Virtual consoles are named /dev/tty#, with numbering starting at /dev/tty1; /dev/tty0 is the current virtual console. /dev/tty0 is the device that should be used to access the system video card on those architectures for which the frame buffer devices -(/dev/fb*) are not applicable. Do not use /dev/console +(/dev/fb*) are not applicable. Do not use /dev/console for this purpose. The console device, /dev/console, is the device to which system @@ -2000,10 +2070,10 @@ Serial ports are RS-232 serial ports and any device which simulates one, either in hardware (such as internal modems) or in software (such as the ISDN driver.) Under Linux, each serial ports has two device names, the primary or callin device and the alternate or callout one. -Each kind of device is indicated by a different letter. For any +Each kind of device is indicated by a different letter. For any letter X, the names of the devices are /dev/ttyX# and /dev/cux#, respectively; for historical reasons, /dev/ttyS# and /dev/ttyC# -correspond to /dev/cua# and /dev/cub#. In the future, it should be +correspond to /dev/cua# and /dev/cub#. In the future, it should be expected that multiple letters will be used; all letters will be upper case for the "tty" device (e.g. /dev/ttyDP#) and lower case for the "cu" device (e.g. /dev/cudp#). @@ -2017,7 +2087,7 @@ support for serial ports. Their use is deprecated, and they may be removed from a future version of Linux. Arbitration of serial ports is provided by the use of lock files with -the names /var/lock/LCK..ttyX#. The contents of the lock file should +the names /var/lock/LCK..ttyX#. The contents of the lock file should be the PID of the locking process as an ASCII number. It is common practice to install links such as /dev/modem @@ -2025,7 +2095,7 @@ which point to serial ports. In order to ensure proper locking in the presence of these links, it is recommended that software chase symlinks and lock all possible names; additionally, it is recommended that a lock file be installed with the corresponding alternate -device. In order to avoid deadlocks, it is recommended that the locks +device. In order to avoid deadlocks, it is recommended that the locks are acquired in the following order, and released in the reverse: 1. The symbolic link name, if any (/var/lock/LCK..modem) @@ -2045,7 +2115,7 @@ port TTY, for which no alternate device would exist. Pseudoterminals, or PTYs, are used to create login sessions or provide other capabilities requiring a TTY line dicipline (including SLIP or -PPP capability) to arbitrary data-generation processes. Each PTY has +PPP capability) to arbitrary data-generation processes. Each PTY has a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named /dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by allowing each master side to be opened only once. diff --git a/MAINTAINERS b/MAINTAINERS index 3d5ee1fc3ee7..932d4dd4482f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1133,6 +1133,13 @@ L: linux-usb@suse.com S: Maintained W: http://www.kroah.com/linux-usb/ +USB MASS STORAGE DRIVER +P: Matthew Dharm +M: mdharm-usb@one-eyed-alien.net +L: linux-usb@suse.com +S: Maintained +W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ + USB UHCI DRIVER P: Georg Acher M: usb@in.tum.de diff --git a/arch/alpha/config.in b/arch/alpha/config.in index d70d42421314..d73afb558c4a 100644 --- a/arch/alpha/config.in +++ b/arch/alpha/config.in @@ -55,7 +55,7 @@ choice 'Alpha system type' \ # clear all implied options (don't want default values for those): unset CONFIG_ALPHA_EV4 CONFIG_ALPHA_EV5 CONFIG_ALPHA_EV6 -unset CONFIG_PCI CONFIG_ISA CONFIG_ALPHA_EISA +unset CONFIG_ALPHA_EISA unset CONFIG_ALPHA_LCA CONFIG_ALPHA_APECS CONFIG_ALPHA_CIA unset CONFIG_ALPHA_T2 CONFIG_ALPHA_PYXIS CONFIG_ALPHA_POLARIS unset CONFIG_ALPHA_TSUNAMI CONFIG_ALPHA_MCPCIA @@ -66,10 +66,13 @@ unset CONFIG_ALPHA_BROKEN_IRQ_MASK # and this doesn't activate hordes of code, so do it always. define_bool CONFIG_ISA y -if [ "$CONFIG_ALPHA_GENERIC" = "y" ] +if [ "$CONFIG_ALPHA_JENSEN" = "y" ] then + define_bool CONFIG_PCI n +else define_bool CONFIG_PCI y fi + if [ "$CONFIG_ALPHA_BOOK1" = "y" ] then define_bool CONFIG_ALPHA_NONAME y @@ -77,22 +80,18 @@ fi if [ "$CONFIG_ALPHA_NONAME" = "y" -o "$CONFIG_ALPHA_EB66" = "y" \ -o "$CONFIG_ALPHA_EB66P" = "y" -o "$CONFIG_ALPHA_P2K" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_LCA y fi if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI" = "y" \ -o "$CONFIG_ALPHA_EB64P" = "y" -o "$CONFIG_ALPHA_XL" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_APECS y fi if [ "$CONFIG_ALPHA_EB164" = "y" -o "$CONFIG_ALPHA_PC164" = "y" \ - -o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_XLT" = "y" \ - -o "$CONFIG_ALPHA_TAKARA" = "y" ] + -o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_TAKARA" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_CIA y fi @@ -107,11 +106,9 @@ then define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_APECS y fi - define_bool CONFIG_PCI y fi if [ "$CONFIG_ALPHA_SABLE" = "y" ] then - define_bool CONFIG_PCI y bool 'EV5 CPU(s) (model 5/xxx)?' CONFIG_ALPHA_GAMMA if [ "$CONFIG_ALPHA_GAMMA" = "y" ] then @@ -124,26 +121,22 @@ fi if [ "$CONFIG_ALPHA_MIATA" = "y" -o "$CONFIG_ALPHA_LX164" = "y" \ -o "$CONFIG_ALPHA_SX164" = "y" -o "$CONFIG_ALPHA_RUFFIAN" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_CIA y define_bool CONFIG_ALPHA_PYXIS y fi if [ "$CONFIG_ALPHA_DP264" = "y" -o "$CONFIG_ALPHA_EIGER" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV6 y define_bool CONFIG_ALPHA_TSUNAMI y fi if [ "$CONFIG_ALPHA_RAWHIDE" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_MCPCIA y fi if [ "$CONFIG_ALPHA_RX164" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_POLARIS y fi @@ -153,7 +146,6 @@ then fi if [ "$CONFIG_ALPHA_NAUTILUS" = "y" ] then - define_bool CONFIG_PCI y define_bool CONFIG_ALPHA_EV6 y define_bool CONFIG_ALPHA_IRONGATE y fi diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index c4752a2167c4..03be84794daa 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +# CONFIG_UID16 is not set # # Code maturity level options @@ -44,7 +45,9 @@ CONFIG_ALPHA_GENERIC=y # CONFIG_ALPHA_SX164 is not set # CONFIG_ALPHA_SABLE is not set # CONFIG_ALPHA_TAKARA is not set +CONFIG_ISA=y CONFIG_PCI=y +CONFIG_ALPHA_BROKEN_IRQ_MASK=y # CONFIG_SMP is not set CONFIG_PCI_NAMES=y # CONFIG_HOTPLUG is not set @@ -58,6 +61,10 @@ CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_EM86=y + +# +# Parallel port support +# # CONFIG_PARPORT is not set # @@ -70,7 +77,10 @@ CONFIG_BINFMT_EM86=y # Block devices # CONFIG_BLK_DEV_FD=y +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set # # Additional Block Devices @@ -79,10 +89,6 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_BLK_DEV_DAC960 is not set -CONFIG_PARIDE_PARPORT=y -# CONFIG_PARIDE is not set # # Networking options @@ -113,11 +119,14 @@ CONFIG_SKB_LARGE=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set +# CONFIG_DECNET is not set # # ATA/IDE/MFM/RLL support # # CONFIG_IDE is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -128,9 +137,11 @@ CONFIG_SCSI=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y +CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 # CONFIG_CHR_DEV_SG is not set # @@ -144,6 +155,7 @@ CONFIG_SCSI_CONSTANTS=y # # SCSI low-level drivers # +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -178,6 +190,7 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_QLOGIC_FAS is not set CONFIG_SCSI_QLOGIC_ISP=y # CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_SEAGATE is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_T128 is not set @@ -194,6 +207,7 @@ CONFIG_NETDEVICES=y # # CONFIG_ARCNET is not set CONFIG_DUMMY=m +# CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_SB1000 is not set @@ -207,15 +221,17 @@ CONFIG_NET_ETHERNET=y # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_DEPCA is not set # CONFIG_NET_ISA is not set -CONFIG_NET_EISA=y +CONFIG_NET_PCI=y # CONFIG_PCNET32 is not set +# CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_APRICOT is not set # CONFIG_CS89x0 is not set CONFIG_DE4X5=y -# CONFIG_DEC_ELCP is not set +# CONFIG_TULIP is not set # CONFIG_DGRS is not set -# CONFIG_EEXPRESS_PRO100 is not set +# CONFIG_EEPRO100 is not set # CONFIG_NE2K_PCI is not set +# CONFIG_8139TOO is not set # CONFIG_SIS900 is not set # CONFIG_TLAN is not set # CONFIG_VIA_RHINE is not set @@ -236,7 +252,7 @@ CONFIG_DE4X5=y # CONFIG_NET_RADIO is not set # -# Token Ring driver support +# Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set @@ -321,15 +337,20 @@ CONFIG_PSMOUSE=y # CONFIG_USB is not set # -# Filesystems +# File systems # # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set # CONFIG_VFAT_FS is not set +# CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set CONFIG_ISO9660_FS=y # CONFIG_JOLIET is not set @@ -337,7 +358,10 @@ CONFIG_ISO9660_FS=y # CONFIG_NTFS_FS is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set @@ -349,6 +373,7 @@ CONFIG_EXT2_FS=y # # CONFIG_CODA_FS is not set CONFIG_NFS_FS=y +# CONFIG_ROOT_NFS is not set # CONFIG_NFSD is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y @@ -361,8 +386,6 @@ CONFIG_LOCKD=y # CONFIG_PARTITION_ADVANCED is not set CONFIG_OSF_PARTITION=y CONFIG_MSDOS_PARTITION=y -# CONFIG_SGI_PARTITION is not set -# CONFIG_SUN_PARTITION is not set # CONFIG_NLS is not set # diff --git a/arch/arm/config.in b/arch/arm/config.in index 2ff7f6414b16..cf6312fc126b 100644 --- a/arch/arm/config.in +++ b/arch/arm/config.in @@ -119,6 +119,8 @@ if [ "$CONFIG_ARCH_NEXUSPCI" = "y" -o \ "$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then define_bool CONFIG_PCI y source drivers/pci/Config.in +else + define_bool CONFIG_PCI n fi # @@ -127,8 +129,10 @@ fi if [ "$CONFIG_ARCH_CATS" = "y" -o \ "$CONFIG_ARCH_SHARK" = "y" -o \ "$CONFIG_ARCH_NETWINDER" = "y" ]; then + define_bool CONFIG_ISA y define_bool CONFIG_ISA_DMA y else + define_bool CONFIG_ISA n define_bool CONFIG_ISA_DMA n fi diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 45c89eeb301b..79cac7fa3021 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -2,6 +2,7 @@ # Automatically generated make config: don't edit # CONFIG_ARM=y +CONFIG_UID16=y # # Code maturity level options @@ -19,14 +20,17 @@ CONFIG_FOOTBRIDGE=y CONFIG_HOST_FOOTBRIDGE=y # CONFIG_ADDIN_FOOTBRIDGE is not set CONFIG_ARCH_EBSA285=y -# CONFIG_CATS is not set +# CONFIG_ARCH_CATS is not set CONFIG_ARCH_NETWINDER=y +# CONFIG_ARCH_PERSONAL_SERVER is not set # CONFIG_ARCH_ACORN is not set CONFIG_CPU_32=y # CONFIG_CPU_26 is not set CONFIG_CPU_32v4=y CONFIG_CPU_SA110=y CONFIG_PCI=y +CONFIG_PCI_NAMES=y +CONFIG_ISA=y CONFIG_ISA_DMA=y # CONFIG_ALIGNMENT_TRAP is not set @@ -51,10 +55,14 @@ CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_ARTHUR is not set + +# +# Parallel port support +# CONFIG_PARPORT=y CONFIG_PARPORT_PC=y CONFIG_PARPORT_PC_FIFO=y -# CONFIG_PARPORT_PC_PCMCIA is not set +# CONFIG_PARPORT_PC_SUPERIO is not set # CONFIG_PARPORT_ARC is not set # CONFIG_PARPORT_AMIGA is not set # CONFIG_PARPORT_MFC3 is not set @@ -67,6 +75,11 @@ CONFIG_LEDS=y CONFIG_LEDS_TIMER=y # CONFIG_LEDS_CPU is not set +# +# IEEE 1394 (FireWire) support +# +# CONFIG_IEEE1394 is not set + # # I2O device support # @@ -87,24 +100,9 @@ CONFIG_ISAPNP=y # Block devices # # CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_CPQ_DA is not set - -# -# Additional Block Devices -# -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=m -CONFIG_MD_STRIPED=m -CONFIG_MD_MIRRORING=m -CONFIG_MD_RAID5=m -CONFIG_BLK_DEV_RAM=y -# CONFIG_BLK_DEV_INITRD is not set # CONFIG_BLK_DEV_XD is not set -# CONFIG_BLK_DEV_DAC960 is not set -CONFIG_PARIDE_PARPORT=y CONFIG_PARIDE=m +CONFIG_PARIDE_PARPORT=y # # Parallel IDE high-level drivers @@ -132,6 +130,19 @@ CONFIG_PARIDE_KBIC=m CONFIG_PARIDE_KTTI=m CONFIG_PARIDE_ON20=m CONFIG_PARIDE_ON26=m +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set + +# +# Additional Block Devices +# +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_STRIPED=m +CONFIG_BLK_DEV_RAM=y +# CONFIG_BLK_DEV_INITRD is not set # # Character devices @@ -148,6 +159,11 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set +# +# I2C support +# +# CONFIG_I2C is not set + # # Mice # @@ -172,6 +188,7 @@ CONFIG_WATCHDOG=y CONFIG_SOFT_WATCHDOG=y # CONFIG_PCWATCHDOG is not set # CONFIG_ACQUIRE_WDT is not set +# CONFIG_MIXCOMWD is not set # CONFIG_21285_WATCHDOG is not set CONFIG_977_WATCHDOG=m CONFIG_DS1620=y @@ -188,29 +205,32 @@ CONFIG_VIDEO_DEV=y # CONFIG_I2C_PARPORT is not set # -# Radio/Video Adapters +# Radio Adapters # # CONFIG_RADIO_CADET is not set # CONFIG_RADIO_RTRACK is not set # CONFIG_RADIO_RTRACK2 is not set # CONFIG_RADIO_AZTECH is not set -# CONFIG_VIDEO_BT848 is not set # CONFIG_RADIO_GEMTEK is not set -# CONFIG_VIDEO_PMS is not set # CONFIG_RADIO_MIROPCM20 is not set -# CONFIG_VIDEO_BWQCAM is not set -# CONFIG_VIDEO_CQCAM is not set -# CONFIG_VIDEO_SAA5249 is not set # CONFIG_RADIO_SF16FMI is not set -# CONFIG_VIDEO_STRADIS is not set # CONFIG_RADIO_TERRATEC is not set # CONFIG_RADIO_TRUST is not set # CONFIG_RADIO_TYPHOON is not set # CONFIG_RADIO_ZOLTRIX is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_BUZ is not set # CONFIG_VIDEO_ZR36120 is not set -CONFIG_VIDEO_CYBERPRO=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -221,15 +241,10 @@ CONFIG_VIDEO_CYBERPRO=m # CONFIG_FTAPE is not set # CONFIG_DRM is not set # CONFIG_DRM_TDFX is not set - -# -# PCMCIA character device support -# -# CONFIG_PCMCIA_SERIAL_CS is not set # CONFIG_AGP is not set # -# Support for USB +# USB support # CONFIG_USB=m @@ -237,32 +252,49 @@ CONFIG_USB=m # USB Controllers # # CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set CONFIG_USB_OHCI=m -CONFIG_USB_OHCI_DEBUG=y -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_VROOTHUB=y # # Miscellaneous USB options # -# CONFIG_USB_DEBUG_ISOC is not set -CONFIG_USB_PROC=y -# CONFIG_USB_EZUSB is not set +CONFIG_USB_DEVICEFS=y # # USB Devices # -CONFIG_USB_MOUSE=m -# CONFIG_USB_HP_SCANNER is not set -CONFIG_USB_KBD=m +CONFIG_USB_PRINTER=m +# CONFIG_USB_SCANNER is not set CONFIG_USB_AUDIO=m CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m # CONFIG_USB_SERIAL is not set # CONFIG_USB_CPIA is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_OV511 is not set # CONFIG_USB_DC2XX is not set -# CONFIG_USB_SCSI is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_STORAGE is not set # CONFIG_USB_USS720 is not set +# CONFIG_USB_DABUSB is not set +# CONFIG_USB_PLUSB is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_DSBR is not set + +# +# USB HID +# +# CONFIG_USB_HID is not set +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +# CONFIG_USB_WACOM is not set +# CONFIG_USB_WMFORCE is not set +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_MIX=y +# CONFIG_INPUT_MOUSEDEV_DIGITIZER is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set # # Console drivers @@ -300,6 +332,7 @@ CONFIG_FBCON_CFB24=y # CONFIG_FBCON_MAC is not set # CONFIG_FBCON_VGA_PLANES is not set CONFIG_FBCON_VGA=y +# CONFIG_FBCON_HGA is not set # CONFIG_FBCON_FONTWIDTH8_ONLY is not set CONFIG_FBCON_FONTS=y CONFIG_FONT_8x8=y @@ -379,6 +412,7 @@ CONFIG_NETDEVICES=y # # CONFIG_ARCNET is not set # CONFIG_DUMMY is not set +# CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_SB1000 is not set @@ -398,30 +432,30 @@ CONFIG_VORTEX=y # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set # CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_RTL8139 is not set -# CONFIG_DM9102 is not set # CONFIG_AT1700 is not set # CONFIG_DEPCA is not set # CONFIG_NET_ISA is not set -CONFIG_NET_EISA=y +CONFIG_NET_PCI=y # CONFIG_PCNET32 is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set # CONFIG_CS89x0 is not set # CONFIG_DE4X5 is not set -CONFIG_DEC_ELCP=m +CONFIG_TULIP=m # CONFIG_DGRS is not set -# CONFIG_EEXPRESS_PRO100 is not set +# CONFIG_DM9102 is not set +# CONFIG_EEPRO100 is not set # CONFIG_LNE390 is not set # CONFIG_NE3210 is not set CONFIG_NE2K_PCI=y +# CONFIG_RTL8129 is not set +# CONFIG_8139TOO is not set # CONFIG_SIS900 is not set # CONFIG_TLAN is not set # CONFIG_VIA_RHINE is not set # CONFIG_ES3210 is not set # CONFIG_EPIC100 is not set -# CONFIG_ZNET is not set # CONFIG_NET_POCKET is not set # @@ -449,7 +483,7 @@ CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_RADIO is not set # -# Token Ring driver support +# Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set @@ -462,22 +496,23 @@ CONFIG_SLIP_MODE_SLIP6=y # CONFIG_WAN is not set # -# PCMCIA network device support +# ATA/IDE/MFM/RLL support # -# CONFIG_NET_PCMCIA is not set +CONFIG_IDE=y # -# ATA/IDE/MFM/RLL support +# IDE, ATA and ATAPI Block devices # -CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y +# CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -487,32 +522,44 @@ CONFIG_IDEDISK_MULTI_MODE=y # IDE chipset support/bugfixes # # CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_IDEPCI_SHARE_IRQ is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_OFFBOARD=y CONFIG_IDEDMA_PCI_AUTO=y -CONFIG_IDEDMA_NEW_DRIVE_LISTINGS=y +CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y -CONFIG_BLK_DEV_OFFBOARD=y +# CONFIG_IDEDMA_PCI_WIP is not set +# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set # CONFIG_BLK_DEV_AEC6210 is not set +# CONFIG_AEC6210_TUNING is not set # CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD7409 is not set +# CONFIG_AMD7409_OVERRIDE is not set # CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_CMD64X_RAID is not set CONFIG_BLK_DEV_CY82C693=y +# CONFIG_BLK_DEV_CS5530 is not set # CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_HPT34X_AUTODMA is not set # CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_HPT366_FIP is not set +# CONFIG_HPT366_MODE3 is not set # CONFIG_BLK_DEV_NS87415 is not set # CONFIG_BLK_DEV_OPTI621 is not set CONFIG_BLK_DEV_PDC202XX=y # CONFIG_PDC202XX_BURST is not set # CONFIG_PDC202XX_MASTER is not set +# CONFIG_BLK_DEV_SIS5513 is not set # CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set CONFIG_BLK_DEV_SL82C105=y -CONFIG_BLK_DEV_IDEDMA=y -CONFIG_IDEDMA_AUTO=y # CONFIG_IDE_CHIPSETS is not set +CONFIG_IDEDMA_AUTO=y CONFIG_BLK_DEV_IDE_MODES=y -# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -533,8 +580,12 @@ CONFIG_SOUND=m # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set # CONFIG_SOUND_AD1816 is not set # CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set # CONFIG_SOUND_CS4232 is not set # CONFIG_SOUND_SSCAPE is not set # CONFIG_SOUND_GUS is not set @@ -545,9 +596,11 @@ CONFIG_SOUND_OSS=m # CONFIG_SOUND_NM256 is not set # CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set # CONFIG_SOUND_PSS is not set # CONFIG_SOUND_SOFTOSS is not set CONFIG_SOUND_SB=m +# CONFIG_SOUND_AWE32_SYNTH is not set # CONFIG_SOUND_WAVEFRONT is not set # CONFIG_SOUND_MAUI is not set # CONFIG_SOUND_VIA82CXXX is not set @@ -555,24 +608,18 @@ CONFIG_SOUND_SB=m # CONFIG_SOUND_OPL3SA1 is not set # CONFIG_SOUND_OPL3SA2 is not set # CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set # CONFIG_SOUND_VIDC is not set CONFIG_SOUND_WAVEARTIST=m -CONFIG_WAVEARTIST_BASE=250 -CONFIG_WAVEARTIST_IRQ=12 -CONFIG_WAVEARTIST_DMA=3 -CONFIG_WAVEARTIST_DMA2=7 # -# Additional low level sound drivers -# -# CONFIG_LOWLEVEL_SOUND is not set - -# -# Filesystems +# File systems # # CONFIG_QUOTA is not set CONFIG_AUTOFS_FS=y +# CONFIG_AUTOFS4_FS is not set CONFIG_ADFS_FS=y +# CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set @@ -581,12 +628,15 @@ CONFIG_MSDOS_FS=m # CONFIG_UMSDOS_FS is not set CONFIG_VFAT_FS=m # CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set CONFIG_ISO9660_FS=m CONFIG_JOLIET=y # CONFIG_MINIX_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set @@ -612,7 +662,14 @@ CONFIG_LOCKD=y # Partition Types # CONFIG_PARTITION_ADVANCED=y +CONFIG_ACORN_PARTITION=y +# CONFIG_ACORN_PARTITION_ICS is not set +CONFIG_ACORN_PARTITION_ADFS=y +# CONFIG_ACORN_PARTITION_POWERTEC is not set +# CONFIG_ACORN_PARTITION_RISCIX is not set # CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y # CONFIG_BSD_DISKLABEL is not set @@ -620,13 +677,6 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_SGI_PARTITION is not set # CONFIG_SUN_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_ACORN_PARTITION=y -CONFIG_ACORN_PARTITION_ADFS=y -# CONFIG_ACORN_PARTITION_ICS is not set -# CONFIG_ACORN_PARTITION_POWERTEC is not set -# CONFIG_ACORN_PARTITION_RISCIX is not set CONFIG_NLS=y # diff --git a/arch/ia64/config.in b/arch/ia64/config.in index e22e1dd01dd2..b0d924d144b7 100644 --- a/arch/ia64/config.in +++ b/arch/ia64/config.in @@ -19,11 +19,11 @@ choice 'Kernel page size' \ if [ "$CONFIG_IA64_DIG" = "y" ]; then bool ' Enable Itanium A-step specific code' CONFIG_ITANIUM_ASTEP_SPECIFIC - bool ' Enable SoftSDV hacks' CONFIG_IA64_SOFTSDV_HACKS n - bool ' Enable BigSur hacks' CONFIG_IA64_BIGSUR_HACKS y - bool ' Enable Lion hacks' CONFIG_IA64_LION_HACKS n - bool ' Emulate PAL/SAL/EFI firmware' CONFIG_IA64_FW_EMU n - bool ' Get PCI IRQ routing from firmware/ACPI' CONFIG_IA64_IRQ_ACPI y + bool ' Enable SoftSDV hacks' CONFIG_IA64_SOFTSDV_HACKS + bool ' Enable BigSur hacks' CONFIG_IA64_BIGSUR_HACKS + bool ' Enable Lion hacks' CONFIG_IA64_LION_HACKS + bool ' Emulate PAL/SAL/EFI firmware' CONFIG_IA64_FW_EMU + bool ' Get PCI IRQ routing from firmware/ACPI' CONFIG_IA64_IRQ_ACPI fi if [ "$CONFIG_IA64_GENERIC" = "y" ]; then @@ -37,33 +37,32 @@ fi define_bool CONFIG_KCORE_ELF y # On IA-64, we always want an ELF /proc/kcore. -bool 'SMP support' CONFIG_SMP n -bool 'Performance monitor support' CONFIG_PERFMON n +bool 'SMP support' CONFIG_SMP +bool 'Performance monitor support' CONFIG_PERFMON -bool 'Networking support' CONFIG_NET n -bool 'System V IPC' CONFIG_SYSVIPC n -bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT n -bool 'Sysctl support' CONFIG_SYSCTL n +bool 'Networking support' CONFIG_NET +bool 'System V IPC' CONFIG_SYSVIPC +bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT +bool 'Sysctl support' CONFIG_SYSCTL tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -bool 'PCI support' CONFIG_PCI n +bool 'PCI support' CONFIG_PCI source drivers/pci/Config.in source drivers/pcmcia/Config.in mainmenu_option next_comment comment 'Code maturity level options' - bool 'Prompt for development and/or incomplete code/drivers' \ - CONFIG_EXPERIMENTAL n + bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL endmenu mainmenu_option next_comment comment 'Loadable module support' - bool 'Enable loadable module support' CONFIG_MODULES n + bool 'Enable loadable module support' CONFIG_MODULES if [ "$CONFIG_MODULES" = "y" ]; then - bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS n - bool 'Kernel module loader' CONFIG_KMOD n + bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS + bool 'Kernel module loader' CONFIG_KMOD fi endmenu @@ -99,7 +98,7 @@ tristate 'SCSI support' CONFIG_SCSI if [ "$CONFIG_SCSI" != "n" ]; then source drivers/scsi/Config.in - bool 'Simulated SCSI disk' CONFIG_SCSI_SIM n + bool 'Simulated SCSI disk' CONFIG_SCSI_SIM fi endmenu @@ -107,7 +106,7 @@ if [ "$CONFIG_NET" = "y" ]; then mainmenu_option next_comment comment 'Network device support' - bool 'Network device support' CONFIG_NETDEVICES n + bool 'Network device support' CONFIG_NETDEVICES if [ "$CONFIG_NETDEVICES" = "y" ]; then source drivers/net/Config.in fi @@ -128,7 +127,7 @@ endmenu mainmenu_option next_comment comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)' -bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI n +bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then source drivers/cdrom/Config.in fi @@ -145,11 +144,11 @@ source fs/nls/Config.in if [ "$CONFIG_VT" = "y" ]; then mainmenu_option next_comment comment 'Console drivers' - bool 'VGA text console' CONFIG_VGA_CONSOLE n + bool 'VGA text console' CONFIG_VGA_CONSOLE + source drivers/video/Config.in if [ "$CONFIG_FB" = "y" ]; then define_bool CONFIG_PCI_CONSOLE y fi - source drivers/video/Config.in endmenu fi @@ -173,11 +172,11 @@ else define_bool CONFIG_MATHEMU y fi -bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ n -bool 'Early printk support (requires VGA!)' CONFIG_IA64_EARLY_PRINTK n -bool 'Turn on compare-and-exchange bug checking (slow!)' CONFIG_IA64_DEBUG_CMPXCHG n -bool 'Turn on irq debug checks (slow!)' CONFIG_IA64_DEBUG_IRQ n -bool 'Print possible IA64 hazards to console' CONFIG_IA64_PRINT_HAZARDS n +bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ +bool 'Early printk support (requires VGA!)' CONFIG_IA64_EARLY_PRINTK +bool 'Turn on compare-and-exchange bug checking (slow!)' CONFIG_IA64_DEBUG_CMPXCHG +bool 'Turn on irq debug checks (slow!)' CONFIG_IA64_DEBUG_IRQ +bool 'Print possible IA64 hazards to console' CONFIG_IA64_PRINT_HAZARDS bool 'Built-in Kernel Debugger support' CONFIG_KDB if [ "$CONFIG_KDB" = "y" ]; then bool 'Compile the kernel with frame pointers' CONFIG_KDB_FRAMEPTR diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index f0e36f6b2b30..1618d5401233 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -2,6 +2,35 @@ # Automatically generated make config: don't edit # +# +# General setup +# +CONFIG_IA64=y +# CONFIG_IA64_GENERIC is not set +CONFIG_IA64_HP_SIM=y +# CONFIG_IA64_SGI_SN1_SIM is not set +# CONFIG_IA64_DIG is not set +# CONFIG_IA64_PAGE_SIZE_4KB is not set +# CONFIG_IA64_PAGE_SIZE_8KB is not set +CONFIG_IA64_PAGE_SIZE_16KB=y +# CONFIG_IA64_PAGE_SIZE_64KB is not set +CONFIG_KCORE_ELF=y +# CONFIG_SMP is not set +# CONFIG_PERFMON is not set +# CONFIG_NET is not set +# CONFIG_SYSVIPC is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_SYSCTL is not set +# CONFIG_BINFMT_ELF is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_PCI=y +CONFIG_PCI_NAMES=y + +# +# PCMCIA/CardBus support +# +# CONFIG_PCMCIA is not set + # # Code maturity level options # @@ -13,53 +42,56 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MODULES is not set # -# General setup +# Parallel port support # -CONFIG_IA64_SIM=y -CONFIG_PCI=y -# CONFIG_PCI_QUIRKS is not set -CONFIG_PCI_OLD_PROC=y -# CONFIG_NET is not set -# CONFIG_SYSVIPC is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_SYSCTL is not set -# CONFIG_BINFMT_ELF is not set -# CONFIG_BINFMT_MISC is not set -# CONFIG_BINFMT_JAVA is not set -# CONFIG_BINFMT_EM86 is not set # CONFIG_PARPORT is not set # -# Plug and Play support +# Plug and Play configuration # # CONFIG_PNP is not set +# CONFIG_ISAPNP is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set # # Additional Block Devices # # CONFIG_BLK_DEV_LOOP is not set -# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_XD is not set -CONFIG_PARIDE_PARPORT=y -# CONFIG_PARIDE is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_PCI is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set # # ATA/IDE/MFM/RLL support # CONFIG_IDE=y + +# +# IDE, ATA and ATAPI Block devices +# CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_BLK_DEV_IDECS is not set @@ -78,24 +110,44 @@ CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set +CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y -# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_IDEDMA_PCI_WIP is not set +# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set +# CONFIG_BLK_DEV_AEC6210 is not set +# CONFIG_AEC6210_TUNING is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD7409 is not set +# CONFIG_AMD7409_OVERRIDE is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_CMD64X_RAID is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_HPT34X_AUTODMA is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_HPT366_FIP is not set +# CONFIG_HPT366_MODE3 is not set CONFIG_BLK_DEV_PIIX=y CONFIG_PIIX_TUNING=y -CONFIG_BLK_DEV_IDEDMA=y -CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_PDC202XX is not set +# CONFIG_PDC202XX_BURST is not set +# CONFIG_PDC202XX_MASTER is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_IDE_CHIPSETS is not set +CONFIG_IDEDMA_AUTO=y CONFIG_BLK_DEV_IDE_MODES=y -# CONFIG_BLK_DEV_HD is not set # # SCSI support # # CONFIG_SCSI is not set -# CONFIG_SCSI_G_NCR5380_PORT is not set -# CONFIG_SCSI_G_NCR5380_MEM is not set # # Amateur Radio support @@ -120,51 +172,91 @@ CONFIG_BLK_DEV_IDE_MODES=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_UNIX98_PTYS is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set # CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_JOYSTICK is not set # CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# # CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set # CONFIG_RTC is not set CONFIG_EFI_RTC=y + +# +# Video For Linux +# # CONFIG_VIDEO_DEV is not set -# CONFIG_NVRAM is not set -# CONFIG_JOYSTICK is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # # CONFIG_FTAPE is not set -# CONFIG_FT_NORMAL_DEBUG is not set -# CONFIG_FT_FULL_DEBUG is not set -# CONFIG_FT_NO_TRACE is not set -# CONFIG_FT_NO_TRACE_AT_ALL is not set -# CONFIG_FT_STD_FDC is not set -# CONFIG_FT_MACH2 is not set -# CONFIG_FT_PROBE_FC10 is not set -# CONFIG_FT_ALT_FDC is not set +# CONFIG_DRM is not set +# CONFIG_DRM_TDFX is not set +# CONFIG_AGP is not set # -# Filesystems +# USB support +# +# CONFIG_USB is not set + +# +# File systems # # CONFIG_QUOTA is not set -# CONFIG_MINIX_FS is not set -# CONFIG_EXT2_FS is not set -# CONFIG_ISO9660_FS is not set -# CONFIG_FAT_FS is not set -# CONFIG_PROC_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_NTFS_FS is not set -# CONFIG_SYSV_FS is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_FAT_FS is not set +# CONFIG_MSDOS_FS is not set +# CONFIG_UMSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_ISO9660_FS is not set +# CONFIG_JOLIET is not set +# CONFIG_MINIX_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_PROC_FS is not set +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DEVPTS_FS is not set +# CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set -# CONFIG_AUTOFS_FS is not set +# CONFIG_EXT2_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_SMD_DISKLABEL is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_ADFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_MAC_PARTITION is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_NLS is not set # CONFIG_NLS is not set # @@ -175,5 +267,11 @@ CONFIG_EFI_RTC=y # # Kernel hacking # +# CONFIG_IA32_SUPPORT is not set # CONFIG_MATHEMU is not set # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_IA64_EARLY_PRINTK is not set +# CONFIG_IA64_DEBUG_CMPXCHG is not set +# CONFIG_IA64_DEBUG_IRQ is not set +# CONFIG_IA64_PRINT_HAZARDS is not set +# CONFIG_KDB is not set diff --git a/arch/m68k/config.in b/arch/m68k/config.in index 52b81739e82d..edcbeb98aa59 100644 --- a/arch/m68k/config.in +++ b/arch/m68k/config.in @@ -15,6 +15,7 @@ endmenu mainmenu_option next_comment comment 'Platform dependent setup' +define_bool CONFIG_ISA n bool 'Amiga support' CONFIG_AMIGA bool 'Atari support' CONFIG_ATARI if [ "$CONFIG_ATARI" = "y" ]; then diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig index e11c32b95bcb..d7261f600ba5 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/defconfig @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_UID16=y # # Code maturity level options @@ -8,18 +9,19 @@ CONFIG_EXPERIMENTAL=y # -# Loadable module support -# -# CONFIG_MODULES is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_KMOD is not set - -# -# Platform-dependent setup +# Platform dependent setup # +# CONFIG_ISA is not set CONFIG_AMIGA=y # CONFIG_ATARI is not set +# CONFIG_PCI is not set # CONFIG_MAC is not set +# CONFIG_APOLLO is not set +# CONFIG_VME is not set +# CONFIG_HP300 is not set +# CONFIG_SUN3X is not set +# CONFIG_SUN3 is not set +# CONFIG_Q40 is not set # # Processor type @@ -28,42 +30,48 @@ CONFIG_M68020=y CONFIG_M68030=y CONFIG_M68040=y # CONFIG_M68060 is not set +# CONFIG_M68KFPU_EMU is not set # CONFIG_ADVANCED is not set -# CONFIG_SINGLE_MEMORY_CHUNK is not set -# CONFIG_RMW_INSNS is not set # # General setup # CONFIG_NET=y CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set CONFIG_ZORRO=y -# CONFIG_AMIGA_GSP is not set -# CONFIG_GSP_RESOLVER is not set -# CONFIG_GSP_A2410 is not set # CONFIG_AMIGA_PCMCIA is not set # CONFIG_HEARTBEAT is not set CONFIG_PROC_HARDWARE=y +# CONFIG_PARPORT is not set +# CONFIG_PRINTER is not set + +# +# Loadable module support +# +# CONFIG_MODULES is not set # -# Block device driver configuration +# Block devices # +# CONFIG_BLK_DEV_FD is not set CONFIG_AMIGA_FLOPPY=y -CONFIG_ATARI_FLOPPY=y -# CONFIG_BLK_DEV_LOOP is not set # CONFIG_AMIGA_Z2RAM is not set -# CONFIG_ATARI_ACSI is not set -# CONFIG_ACSI_MULTI_LUN is not set -# CONFIG_ATARI_SLM +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set + +# +# Additional Block Devices +# # CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set -# CONFIG_MD_LINEAR is not set -# CONFIG_MD_STRIPED is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_INITRD=y @@ -71,8 +79,9 @@ CONFIG_BLK_DEV_INITRD=y # Networking options # CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set # CONFIG_NETLINK is not set -# CONFIG_FIREWALL is not set +# CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y CONFIG_INET=y @@ -88,16 +97,17 @@ CONFIG_INET=y # # (it is safe to leave these untouched) # -# CONFIG_INET_RARP is not set -CONFIG_IP_NOSR=y # CONFIG_SKB_LARGE is not set # CONFIG_IPV6 is not set +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set # # # # CONFIG_IPX is not set # CONFIG_ATALK is not set +# CONFIG_DECNET is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_BRIDGE is not set @@ -106,7 +116,6 @@ CONFIG_IP_NOSR=y # CONFIG_WAN_ROUTER is not set # CONFIG_NET_FASTROUTE is not set # CONFIG_NET_HW_FLOWCONTROL is not set -# CONFIG_CPU_IS_SLOW is not set # # QoS and/or fair queueing @@ -117,6 +126,8 @@ CONFIG_IP_NOSR=y # ATA/IDE/MFM/RLL support # # CONFIG_IDE is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -124,12 +135,15 @@ CONFIG_IP_NOSR=y CONFIG_SCSI=y # -# SCSI support type (disk, tape, CDrom) +# SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y +CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y +CONFIG_ST_EXTRA_DEVS=2 CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 # CONFIG_CHR_DEV_SG is not set # @@ -143,6 +157,7 @@ CONFIG_SCSI_CONSTANTS=y # SCSI low-level drivers # CONFIG_A3000_SCSI=y +# CONFIG_A4000T_SCSI is not set CONFIG_A2091_SCSI=y CONFIG_GVP11_SCSI=y # CONFIG_CYBERSTORM_SCSI is not set @@ -150,13 +165,10 @@ CONFIG_GVP11_SCSI=y # CONFIG_BLZ2060_SCSI is not set # CONFIG_BLZ1230_SCSI is not set # CONFIG_FASTLANE_SCSI is not set -# CONFIG_A4000T_SCSI is not set # CONFIG_A4091_SCSI is not set # CONFIG_WARPENGINE_SCSI is not set # CONFIG_BLZ603EPLUS_SCSI is not set -CONFIG_ATARI_SCSI=y -# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set -# CONFIG_ATARI_SCSI_RESET_BOOT is not set +# CONFIG_OKTAGON_SCSI is not set # # Network device support @@ -165,80 +177,150 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_SLIP is not set # CONFIG_PPP is not set +# CONFIG_EQUALIZER is not set # CONFIG_ARIADNE is not set # CONFIG_ARIADNE2 is not set # CONFIG_A2065 is not set # CONFIG_HYDRA is not set -# CONFIG_APNE is not set -# CONFIG_ATARILANCE is not set -# CONFIG_ATARI_BIONET is not set -# CONFIG_ATARI_PAMSNET is not set # -# Filesystems +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_AMIGAMOUSE=y +CONFIG_BUSMOUSE=y +CONFIG_AMIGA_BUILTIN_SERIAL=y +# CONFIG_GVPIOEXT is not set +# CONFIG_GVPIOEXT_LP is not set +# CONFIG_GVPIOEXT_PLIP is not set +# CONFIG_MULTIFACE_III_TTY is not set +# CONFIG_SERIAL_CONSOLE is not set +# CONFIG_USERIAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 + +# +# Sound support +# +# CONFIG_SOUND is not set + +# +# File systems # # CONFIG_QUOTA is not set -CONFIG_MINIX_FS=y -CONFIG_EXT2_FS=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y -# CONFIG_VFAT_FS is not set # CONFIG_UMSDOS_FS is not set -# CONFIG_MSDOS_PARTITION is not set -CONFIG_PROC_FS=y -CONFIG_NFS_FS=y -# CONFIG_ROOT_NFS is not set -# CONFIG_SMB_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set # CONFIG_ISO9660_FS is not set +# CONFIG_JOLIET is not set +CONFIG_MINIX_FS=y +# CONFIG_NTFS_FS is not set # CONFIG_HPFS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_AFFS_FS is not set +CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=y +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_CRAMFS is not set # -# Frame buffer devices +# Network File Systems +# +# CONFIG_CODA_FS is not set +CONFIG_NFS_FS=y +# CONFIG_ROOT_NFS is not set +# CONFIG_NFSD is not set +CONFIG_SUNRPC=y +CONFIG_LOCKD=y +# CONFIG_SMB_FS is not set +# CONFIG_NCP_FS is not set + +# +# Partition Types # +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_AMIGA_PARTITION=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set + +# +# Console drivers +# +CONFIG_FB=y + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_CLGEN is not set +# CONFIG_FB_PM2 is not set CONFIG_FB_AMIGA=y CONFIG_FB_AMIGA_OCS=y CONFIG_FB_AMIGA_ECS=y CONFIG_FB_AMIGA_AGA=y # CONFIG_FB_CYBER is not set # CONFIG_FB_VIRGE is not set -# CONFIG_FB_CVPPC is not set # CONFIG_FB_RETINAZ3 is not set -# CONFIG_FB_CLGEN is not set -# CONFIG_FB_ATARI is not set +# CONFIG_FB_FM2 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FBCON_ADVANCED is not set - -CONFIG_NLS_CODEPAGE_437=y - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_M68K_PRINTER is not set -CONFIG_AMIGAMOUSE=y -CONFIG_ATARIMOUSE=y -CONFIG_AMIGA_BUILTIN_SERIAL=y -# CONFIG_GVPIOEXT is not set -# CONFIG_GVPIOEXT_LP is not set -# CONFIG_GVPIOEXT_PLIP is not set -# CONFIG_MULTIFACE_III_TTY is not set -# CONFIG_USERIAL is not set -# CONFIG_WATCHDOG is not set -# CONFIG_UMISC is not set - -# -# Sound -# -# CONFIG_SOUND is not set -# CONFIG_DMASOUND is not set +CONFIG_FBCON_MFB=y +CONFIG_FBCON_AFB=y +CONFIG_FBCON_ILBM=y +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +# CONFIG_FBCON_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_FONT_PEARL_8x8=y # # Kernel hacking # -CONFIG_SCSI_CONSTANTS=y +# CONFIG_MAGIC_SYSRQ is not set diff --git a/arch/mips/config.in b/arch/mips/config.in index c89ab7db10f9..244d37318e9b 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -26,34 +26,37 @@ bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI # # Select some configuration options automatically for certain systems. # -unset CONFIG_PCI -unset CONFIG_ISA unset CONFIG_MIPS_JAZZ unset CONFIG_VIDEO_G364 -if [ "$CONFIG_ALGOR_P4032" = "y" ]; then +if [ "$CONFIG_ALGOR_P4032" = "y" -o "$CONFIG_SNI_RM200_PCI" = "y" -o \ + "$CONFIG_DDB5074" = "y" ]; then define_bool CONFIG_PCI y +else + define_bool CONFIG_PCI n fi +if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o "$CONFIG_OLIVETTI_M700" = "y" -o \ + "$CONFIG_SNI_RM200_PCI" = "y" -o "$CONFIG_ACER_PICA_61" = "y" ]; then + define_bool CONFIG_ISA y +else + define_bool CONFIG_ISA n +fi + if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \ "$CONFIG_OLIVETTI_M700" = "y" ]; then - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_FB y define_bool CONFIG_FB_G364 y fi if [ "$CONFIG_ACER_PICA_61" = "y" ]; then - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_MIPS_JAZZ y fi if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y - define_bool CONFIG_PCI y fi if [ "$CONFIG_DDB5074" = "y" ]; then - define_bool CONFIG_PCI y define_bool CONFIG_HAVE_IO_PORTS y fi endmenu diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 4e07ae1d3f7f..e6f65300f6a8 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -19,6 +19,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_OLIVETTI_M700 is not set CONFIG_SGI_IP22=y # CONFIG_SNI_RM200_PCI is not set +# CONFIG_PCI is not set +# CONFIG_ISA is not set # # CPU selection @@ -73,6 +75,8 @@ CONFIG_KMOD=y # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # # Additional Block Devices @@ -81,8 +85,6 @@ CONFIG_KMOD=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set # # Networking options @@ -133,16 +135,12 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_NET_SCHED is not set -# -# Telephony Support -# -# CONFIG_PHONE is not set -# CONFIG_PHONE_IXJ is not set - # # ATA/IDE/MFM/RLL support # # CONFIG_IDE is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -155,7 +153,6 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y -CONFIG_ST_EXTRA_DEVS=2 CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_SR_EXTRA_DEVS=2 @@ -207,26 +204,80 @@ CONFIG_SCSI_SGIWD93=y # CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_ULTRASTOR is not set # CONFIG_SCSI_DEBUG is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # -# I2O device support +# Network device support # -# CONFIG_I2O is not set -# CONFIG_I2O_PCI is not set -# CONFIG_I2O_BLOCK is not set -# CONFIG_I2O_LAN is not set -# CONFIG_I2O_SCSI is not set -# CONFIG_I2O_PROC is not set +CONFIG_NETDEVICES=y # -# Network device support +# ARCnet devices # -CONFIG_NETDEVICES=y +# CONFIG_ARCNET is not set # CONFIG_DUMMY is not set -# CONFIG_SLIP is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_SB1000 is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_YELLOWFIN is not set +# CONFIG_ACENIC is not set +# CONFIG_SK98LIN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set # CONFIG_PPP is not set -CONFIG_SGISEEQ=y +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# AX.25 network device drivers +# +# CONFIG_MKISS is not set +# CONFIG_6PACK is not set +# CONFIG_BPQETHER is not set +# CONFIG_DMASCC is not set +# CONFIG_SCC is not set +# CONFIG_BAYCOM_SER_FDX is not set +# CONFIG_BAYCOM_SER_HDX is not set +# CONFIG_BAYCOM_PAR is not set +# CONFIG_BAYCOM_EPP is not set +# CONFIG_SOUNDMODEM is not set +# CONFIG_YAM is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Old CD-ROM drivers (not SCSI, not IDE) +# +# CONFIG_CD_NO_IDESCSI is not set # # Character devices @@ -336,8 +387,15 @@ CONFIG_LOCKD=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +# CONFIG_MSDOS_PARTITION is not set CONFIG_SGI_PARTITION=y +# CONFIG_SUN_PARTITION is not set # CONFIG_NLS is not set # diff --git a/arch/mips64/config.in b/arch/mips64/config.in index 0e996ab7439c..df87c3adf478 100644 --- a/arch/mips64/config.in +++ b/arch/mips64/config.in @@ -35,7 +35,8 @@ unset CONFIG_ARC64 unset CONFIG_BOARD_SCACHE unset CONFIG_COHERENT_IO unset CONFIG_BINFMT_ELF32 -unset CONFIG_PCI + +define_bool CONFIG_ISA n if [ "$CONFIG_SGI_IP22" = "y" ]; then define_bool CONFIG_BOOT_ELF32 y @@ -50,6 +51,8 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then define_bool CONFIG_COHERENT_IO y define_bool CONFIG_PCI y define_bool CONFIG_QL_ISP_A64 y +else + define_bool CONFIG_PCI n fi mainmenu_option next_comment diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 61bc4acfcbd5..ca5730c8929f 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -14,6 +14,7 @@ CONFIG_SGI_IP27=y # CONFIG_SGI_SN0_N_MODE is not set # CONFIG_DISCONTIGMEM is not set +# CONFIG_ISA is not set CONFIG_BOOT_ELF64=y CONFIG_ARC64=y CONFIG_COHERENT_IO=y @@ -60,7 +61,10 @@ CONFIG_PCI_NAMES=y # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set # # Additional Block Devices @@ -69,9 +73,6 @@ CONFIG_PCI_NAMES=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_PARIDE is not set # # Networking options @@ -103,6 +104,7 @@ CONFIG_SKB_LARGE=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set +# CONFIG_DECNET is not set # # Telephony Support @@ -114,6 +116,8 @@ CONFIG_SKB_LARGE=y # ATA/IDE/MFM/RLL support # # CONFIG_IDE is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -126,7 +130,6 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set -CONFIG_ST_EXTRA_DEVS=2 # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -141,6 +144,7 @@ CONFIG_ST_EXTRA_DEVS=2 # # SCSI low-level drivers # +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -204,6 +208,7 @@ CONFIG_NETDEVICES=y # # CONFIG_ARCNET is not set # CONFIG_DUMMY is not set +# CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_SB1000 is not set @@ -218,7 +223,7 @@ CONFIG_SGI_IOC3_ETH=y # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_DEPCA is not set # CONFIG_NET_ISA is not set -# CONFIG_NET_EISA is not set +# CONFIG_NET_PCI is not set # CONFIG_NET_POCKET is not set # @@ -237,7 +242,7 @@ CONFIG_SGI_IOC3_ETH=y # CONFIG_NET_RADIO is not set # -# Token Ring driver support +# Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set @@ -324,7 +329,7 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_USB is not set # -# Filesystems +# File systems # # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set @@ -343,20 +348,17 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_JOLIET is not set # CONFIG_MINIX_FS is not set # CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set # CONFIG_DEVPTS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set -# CONFIG_SYSV_FS_WRITE is not set # CONFIG_UDF_FS is not set -# CONFIG_UDF_RW is not set # CONFIG_UFS_FS is not set -# CONFIG_UFS_FS_WRITE is not set # # Network File Systems @@ -365,7 +367,6 @@ CONFIG_EXT2_FS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set -# CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set @@ -374,8 +375,15 @@ CONFIG_LOCKD=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +# CONFIG_MSDOS_PARTITION is not set CONFIG_SGI_PARTITION=y +# CONFIG_SUN_PARTITION is not set # CONFIG_NLS is not set CONFIG_KCORE_ELF=y diff --git a/arch/ppc/config.in b/arch/ppc/config.in index 38d9dc72e124..e21140d9db30 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -19,7 +19,7 @@ choice 'Processor Type' \ 4xx CONFIG_4xx \ 630/Power3(64-Bit) CONFIG_PPC64 \ 82xx CONFIG_82xx \ - 8xx CONFIG_8xx" 6xx/7xx + 8xx CONFIG_8xx" 6xx if [ "$CONFIG_4xx" = "y" ]; then choice 'Machine Type' \ @@ -82,20 +82,18 @@ endmenu mainmenu_option next_comment comment 'General setup' -if [ "$CONFIG_APUS" = "y" ]; then - define_bool CONFIG_PCI n -fi -if [ "$CONFIG_OAK" = "y" ]; then - define_bool CONFIG_PCI n -fi -if [ "$CONFIG_8xx" = "y" ]; then - bool 'QSpan PCI' CONFIG_PCI -fi -if [ "$CONFIG_6xx" = "y" -a "$CONFIG_APUS" != "y" ]; then - define_bool CONFIG_PCI y -fi -if [ "$CONFIG_PREP" = "y" -o "$CONFIG_PMAC" = "y" -o "$CONFIG_CHRP" = "y" -o "$CONFIG_ALL_PPC" = "y" ]; then - define_bool CONFIG_PCI y +define_bool CONFIG_ISA n + +if [ "$CONFIG_APUS" = "y" -o "$CONFIG_4xx" = "y" -o \ + "$CONFIG_82xx" = "y" ]; then + define_bool CONFIG_PCI n +else + if [ "$CONFIG_6xx" = "y" -o CONFIG_PPC64 ]; then + define_bool CONFIG_PCI y + else + # CONFIG_8xx + bool 'QSpan PCI' CONFIG_PCI + fi fi bool 'Networking support' CONFIG_NET diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index 72d8f66ee7f0..1f57847010d0 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -33,8 +33,7 @@ CONFIG_KMOD=y # # General setup # -# CONFIG_PCI is not set -CONFIG_PCI=y +# CONFIG_ISA is not set CONFIG_PCI=y CONFIG_NET=y CONFIG_SYSCTL=y @@ -57,6 +56,7 @@ CONFIG_FB_COMPAT_XPMAC=y CONFIG_PMAC_PBOOK=y CONFIG_MAC_FLOPPY=y CONFIG_MAC_SERIAL=y +# CONFIG_SERIAL_CONSOLE is not set CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_MACIO=y @@ -73,12 +73,14 @@ CONFIG_BOOTX_TEXT=y # Plug and Play configuration # # CONFIG_PNP is not set +# CONFIG_ISAPNP is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -158,6 +160,7 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -167,16 +170,38 @@ CONFIG_BLK_DEV_IDESCSI=y # IDE chipset support/bugfixes # # CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEPCI=y # CONFIG_IDEPCI_SHARE_IRQ is not set # CONFIG_BLK_DEV_IDEDMA_PCI is not set # CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_IDEDMA_PCI_AUTO is not set # CONFIG_BLK_DEV_IDEDMA is not set CONFIG_IDEDMA_PCI_EXPERIMENTAL=y +# CONFIG_IDEDMA_PCI_WIP is not set +# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set +# CONFIG_BLK_DEV_AEC6210 is not set +# CONFIG_AEC6210_TUNING is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD7409 is not set +# CONFIG_AMD7409_OVERRIDE is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_CMD64X_RAID is not set # CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_HPT34X_AUTODMA is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_HPT366_FIP is not set +# CONFIG_HPT366_MODE3 is not set # CONFIG_BLK_DEV_NS87415 is not set # CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_PDC202XX is not set +# CONFIG_PDC202XX_BURST is not set +# CONFIG_PDC202XX_MASTER is not set +# CONFIG_BLK_DEV_SIS5513 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_BLK_DEV_SL82C105 is not set @@ -483,6 +508,7 @@ CONFIG_NVRAM=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set +# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # @@ -514,7 +540,9 @@ CONFIG_USB_OHCI=y # CONFIG_USB_IBMCAM is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set # CONFIG_USB_STORAGE is not set +# CONFIG_USB_USS720 is not set # CONFIG_USB_DABUSB is not set # CONFIG_USB_PLUSB is not set # CONFIG_USB_PEGASUS is not set @@ -559,6 +587,7 @@ CONFIG_ISO9660_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set @@ -572,6 +601,7 @@ CONFIG_EXT2_FS=y # # CONFIG_CODA_FS is not set CONFIG_NFS_FS=y +# CONFIG_ROOT_NFS is not set CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y @@ -659,6 +689,7 @@ CONFIG_SOUND_CS4232=m # CONFIG_SOUND_NM256 is not set # CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set # CONFIG_SOUND_PSS is not set # CONFIG_SOUND_SOFTOSS is not set # CONFIG_SOUND_SB is not set diff --git a/arch/sh/config.in b/arch/sh/config.in index c711ee931ce3..e3bfd113c4af 100644 --- a/arch/sh/config.in +++ b/arch/sh/config.in @@ -47,6 +47,8 @@ endmenu mainmenu_option next_comment comment 'General setup' +define_bool CONFIG_ISA n + bool 'Networking support' CONFIG_NET bool 'Directy Connected Compact Flash support' CONFIG_CF_ENABLER diff --git a/arch/sh/defconfig b/arch/sh/defconfig index a3f90122045c..fad2ab8b146b 100644 --- a/arch/sh/defconfig +++ b/arch/sh/defconfig @@ -28,6 +28,7 @@ CONFIG_MEMORY_START=0c000000 # # General setup # +# CONFIG_ISA is not set # CONFIG_NET is not set CONFIG_CF_ENABLER=y # CONFIG_PCI is not set @@ -39,12 +40,18 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set + +# +# Parallel port support +# # CONFIG_PARPORT is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # # Additional Block Devices @@ -53,21 +60,25 @@ CONFIG_BINFMT_ELF=y # CONFIG_BLK_DEV_MD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_INITRD=y -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set # # ATA/IDE/MFM/RLL support # CONFIG_IDE=y + +# +# IDE, ATA and ATAPI Block devices +# CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -77,9 +88,11 @@ CONFIG_BLK_DEV_IDEDISK=y # IDE chipset support/bugfixes # # CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set # CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_IDE_MODES is not set -# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -101,13 +114,20 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_UNIX98_PTYS is not set # -# Filesystems +# File systems # # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set +# CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set # CONFIG_FAT_FS is not set +# CONFIG_MSDOS_FS is not set +# CONFIG_UMSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_ISO9660_FS is not set # CONFIG_JOLIET is not set @@ -115,6 +135,10 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_NTFS_FS is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DEVPTS_FS is not set +# CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set diff --git a/arch/sparc/config.in b/arch/sparc/config.in index e67a4302216f..e77e72a766d9 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -36,6 +36,8 @@ bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4 if [ "$CONFIG_SUN4" != "y" ]; then bool 'Support for PCI and PS/2 keyboard/mouse' CONFIG_PCI source drivers/pci/Config.in +else + define_bool CONFIG_PCI n fi tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in index b4d7e5da9bae..8f06e836b649 100644 --- a/arch/sparc64/config.in +++ b/arch/sparc64/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.104 2000/03/15 15:02:28 jj Exp $ +# $Id: config.in,v 1.105 2000/03/24 00:34:11 davem Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -29,6 +29,7 @@ define_bool CONFIG_SUN_KEYBOARD y define_bool CONFIG_SUN_CONSOLE y define_bool CONFIG_SUN_AUXIO y define_bool CONFIG_SUN_IO y +define_bool CONFIG_ISA n bool 'PCI support' CONFIG_PCI source drivers/pci/Config.in @@ -230,6 +231,7 @@ if [ "$CONFIG_NET" = "y" ]; then tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX tristate 'RealTek RTL-8139 support' CONFIG_8139TOO tristate 'PCI NE2000 support' CONFIG_NE2K_PCI + tristate 'VIA Rhine support' CONFIG_VIA_RHINE tristate 'EtherExpressPro/100 support' CONFIG_EEPRO100 tristate 'Adaptec Starfire support' CONFIG_ADAPTEC_STARFIRE fi diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 2f1d42a19121..4cfd9b5656c6 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -24,6 +24,7 @@ CONFIG_SUN_KEYBOARD=y CONFIG_SUN_CONSOLE=y CONFIG_SUN_AUXIO=y CONFIG_SUN_IO=y +# CONFIG_ISA is not set CONFIG_PCI=y CONFIG_PCI_NAMES=y CONFIG_SUN_OPENPROMFS=m @@ -218,7 +219,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_IDEDMA_PCI_AUTO=y CONFIG_BLK_DEV_IDEDMA=y -CONFIG_IDEDMA_AUTO=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y # CONFIG_IDEDMA_PCI_WIP is not set # CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set @@ -245,6 +245,7 @@ CONFIG_BLK_DEV_NS87415=y # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_IDE_CHIPSETS is not set +CONFIG_IDEDMA_AUTO=y CONFIG_BLK_DEV_IDE_MODES=y # @@ -336,6 +337,7 @@ CONFIG_TULIP=m CONFIG_VORTEX=m CONFIG_8139TOO=m CONFIG_NE2K_PCI=m +CONFIG_VIA_RHINE=m CONFIG_EEPRO100=m CONFIG_ADAPTEC_STARFIRE=m diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index af91f266ff98..d752f1a0d0ab 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -1,4 +1,4 @@ -/* $Id: sys_sparc32.c,v 1.140 2000/03/22 02:44:35 davem Exp $ +/* $Id: sys_sparc32.c,v 1.141 2000/03/24 01:31:30 davem Exp $ * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls. * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -4144,7 +4144,7 @@ asmlinkage long sparc32_open(const char * filename, int flags, int mode) if (fd >= 0) { struct file * f; lock_kernel(); - f = filp_open(tmp, flags, mode); + f = filp_open(tmp, flags, mode, NULL); unlock_kernel(); error = PTR_ERR(f); if (IS_ERR(f)) diff --git a/arch/sparc64/lib/memcmp.S b/arch/sparc64/lib/memcmp.S index 4c08d57c3c38..d34dc3d874da 100644 --- a/arch/sparc64/lib/memcmp.S +++ b/arch/sparc64/lib/memcmp.S @@ -1,29 +1,28 @@ -/* $Id: memcmp.S,v 1.2 1997/04/01 03:43:18 davem Exp $ +/* $Id: memcmp.S,v 1.3 2000/03/23 07:51:08 davem Exp $ * Sparc64 optimized memcmp code. * * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) + * Copyright (C) 2000 David S. Miller (davem@redhat.com) */ .text - .align 4 - .globl __memcmp, memcmp + .align 32 + .globl __memcmp, memcmp __memcmp: memcmp: - brlez,pn %o2, 2f - sub %g0, %o2, %o3 - add %o0, %o2, %o0 - add %o1, %o2, %o1 - ldub [%o0 + %o3], %o4 -1: - ldub [%o1 + %o3], %o5 - sub %o4, %o5, %o4 - brnz,pn %o4, 3f - addcc %o3, 1, %o3 - bne,a,pt %xcc, 1b - ldub [%o0 + %o3], %o4 -2: - retl - clr %o0 -3: - retl - mov %o4, %o0 + cmp %o2, 0 ! IEU1 Group +loop: be,pn %icc, ret_0 ! CTI + nop ! IEU0 + ldub [%o0], %g5 ! LSU Group + ldub [%o1], %g3 ! LSU Group + sub %o2, 1, %o2 ! IEU0 + add %o0, 1, %o0 ! IEU1 + add %o1, 1, %o1 ! IEU0 Group + subcc %g5, %g3, %g3 ! IEU1 Group + be,pt %icc, loop ! CTI + cmp %o2, 0 ! IEU1 Group + +ret_n0: retl + mov %g3, %o0 +ret_0: retl + mov 0, %o0 diff --git a/drivers/isdn/avmb1/b1pcmcia.c b/drivers/isdn/avmb1/b1pcmcia.c index fdea6a9d3686..ff90b42c8c92 100644 --- a/drivers/isdn/avmb1/b1pcmcia.c +++ b/drivers/isdn/avmb1/b1pcmcia.c @@ -60,7 +60,6 @@ * */ -#include #include #include #include diff --git a/drivers/isdn/avmb1/capi.c b/drivers/isdn/avmb1/capi.c index 072c31f89595..3bbc329e16f6 100644 --- a/drivers/isdn/avmb1/capi.c +++ b/drivers/isdn/avmb1/capi.c @@ -154,6 +154,7 @@ * */ +#include #include #include #include diff --git a/drivers/isdn/avmb1/capifs.c b/drivers/isdn/avmb1/capifs.c index a8e05cef7e4f..b869e6b5cea4 100644 --- a/drivers/isdn/avmb1/capifs.c +++ b/drivers/isdn/avmb1/capifs.c @@ -44,15 +44,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include #include #include #include diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index a6b695642538..a9988e77b597 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -31,15 +31,15 @@ LK1.1.2: - Urban Widmark: minor cleanups, merges from Becker 1.03a/1.04 versions + LK1.1.3: + - Urban Widmark: use PCI DMA interface (with thanks to the eepro100.c code) + update "Theory of Operation" with softnet/locking changes + - Dave Miller: PCI DMA and endian fixups + - Jeff Garzik: MOD_xxx race fixes, updated PCI resource allocation */ -static const char *versionA = -"via-rhine.c:v1.03a-LK1.1.2 3/19/2000 Written by Donald Becker\n"; -static const char *versionB = -" http://cesdis.gsfc.nasa.gov/linux/drivers/via-rhine.html\n"; - /* A few user-configurable values. These may be modified when a driver - module is loaded.*/ + module is loaded. */ static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */ static int max_interrupt_work = 20; @@ -61,6 +61,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; The Rhine has a 64 element 8390-like hash table. */ static const int multicast_filter_limit = 32; + /* Operational parameters that are set at compile time. */ /* Keep the ring sizes a power of two for compile efficiency. @@ -71,12 +72,15 @@ static const int multicast_filter_limit = 32; #define TX_RING_SIZE 8 #define RX_RING_SIZE 16 + /* Operational parameters that usually are not changed. */ + /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (2*HZ) #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ + #if !defined(__OPTIMIZE__) || !defined(__KERNEL__) #warning You must compile this file with the correct options! #warning See the last lines of the source file. @@ -100,9 +104,12 @@ static const int multicast_filter_limit = 32; #include #include -/* Condensed bus+endian portability operations. */ -#define virt_to_le32desc(addr) cpu_to_le32(virt_to_bus(addr)) -#define le32desc_to_virt(addr) bus_to_virt(le32_to_cpu(addr)) +static const char *versionA __devinitdata = +"via-rhine.c:v1.03a-LK1.1.3 3/23/2000 Written by Donald Becker\n"; +static const char *versionB __devinitdata = +" http://cesdis.gsfc.nasa.gov/linux/drivers/via-rhine.html\n"; + + /* This driver was written to use PCI memory space, however most versions of the Rhine only work correctly with I/O space accesses. */ @@ -125,9 +132,6 @@ static const int multicast_filter_limit = 32; #define writel outl #endif -/* Kernel compatibility defines, some common to David Hind's PCMCIA package. - This is only in the support-all-kernels source code. */ - #define RUN_AT(x) (jiffies + (x)) MODULE_AUTHOR("Donald Becker "); @@ -197,18 +201,17 @@ IIId. Synchronization The driver runs as two independent, single-threaded flows of control. One is the send-packet routine, which enforces single-threaded use by the -dev->tbusy flag. The other thread is the interrupt handler, which is single -threaded by the hardware and interrupt handling software. +dev->priv->lock spinlock. The other thread is the interrupt handler, which +is single threaded by the hardware and interrupt handling software. -The send packet thread has partial control over the Tx ring and 'dev->tbusy' -flag. It sets the tbusy flag whenever it's queuing a Tx packet. If the next -queue slot is empty, it clears the tbusy flag when finished otherwise it sets -the 'lp->tx_full' flag. +The send packet thread has partial control over the Tx ring. It locks the +dev->priv->lock whenever it's queuing a Tx packet. If the next slot in the ring +is not available it stops the transmit queue by calling netif_stop_queue. The interrupt handler has exclusive control over the Rx ring and records stats from the Tx ring. After reaping the stats, it marks the Tx queue entry as -empty by incrementing the dirty_tx mark. Iff the 'lp->tx_full' flag is set, it -clears both the tx_full and tbusy flags. +empty by incrementing the dirty_tx mark. If at least half of the entries in +the Rx ring are available the transmit queue is woken up if it was stopped. IV. Notes @@ -334,18 +337,26 @@ enum chip_cmd_bits { }; struct netdev_private { - /* Descriptor rings first for alignment. */ - struct rx_desc rx_ring[RX_RING_SIZE]; - struct tx_desc tx_ring[TX_RING_SIZE]; + /* Descriptor rings */ + struct rx_desc *rx_ring; + struct tx_desc *tx_ring; + dma_addr_t rx_ring_dma; + dma_addr_t tx_ring_dma; + /* The addresses of receive-in-place skbuffs. */ - struct sk_buff* rx_skbuff[RX_RING_SIZE]; + struct sk_buff *rx_skbuff[RX_RING_SIZE]; + dma_addr_t rx_skbuff_dma[RX_RING_SIZE]; + /* The saved address of a sent-in-place packet/buffer, for later free(). */ - struct sk_buff* tx_skbuff[TX_RING_SIZE]; + struct sk_buff *tx_skbuff[TX_RING_SIZE]; + dma_addr_t tx_skbuff_dma[TX_RING_SIZE]; unsigned char *tx_buf[TX_RING_SIZE]; /* Tx bounce buffers */ - unsigned char *tx_bufs; /* Tx bounce buffer region. */ + + struct pci_dev *pdev; struct net_device_stats stats; struct timer_list timer; /* Media monitoring timer. */ spinlock_t lock; + /* Frequently used values: keep some adjacent for cache effect. */ int chip_id; struct rx_desc *rx_head_desc; @@ -354,12 +365,14 @@ struct netdev_private { unsigned int rx_buf_sz; /* Based on MTU+slack. */ u16 chip_cmd; /* Current setting for ChipCmd */ unsigned int tx_full:1; /* The Tx queue is full. */ + /* These values are keep track of the transceiver/media in use. */ unsigned int full_duplex:1; /* Full-duplex operation requested. */ unsigned int duplex_lock:1; unsigned int medialock:1; /* Do not sense media. */ unsigned int default_port:4; /* Last dev->if_port value. */ u8 tx_thresh, rx_thresh; + /* MII transceiver section. */ int mii_cnt; /* MII device addresses. */ u16 advertising; /* NWay media advertisement */ @@ -397,6 +410,8 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev, long ioaddr; int io_size; int pci_flags; + void *ring; + dma_addr_t ring_dma; /* print version once and once only */ if (! did_version++) { @@ -409,12 +424,35 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev, io_size = via_rhine_chip_info[chip_id].io_size; pci_flags = via_rhine_chip_info[chip_id].pci_flags; + /* this should always be supported */ + if (!pci_dma_supported(pdev, 0xffffffff)) { + printk(KERN_ERR "32-bit PCI DMA addresses not supported by the card!?\n"); + goto err_out; + } + + /* sanity check */ + if ((pci_resource_len (pdev, 0) < io_size) || + (pci_resource_len (pdev, 1) < io_size)) { + printk (KERN_ERR "Insufficient PCI resources, aborting\n"); + goto err_out; + } + + /* allocate pci dma space for rx and tx descriptor rings */ + ring = pci_alloc_consistent(pdev, + RX_RING_SIZE * sizeof(struct rx_desc) + + TX_RING_SIZE * sizeof(struct tx_desc), + &ring_dma); + if (!ring) { + printk(KERN_ERR "Could not allocate DMA memory.\n"); + goto err_out; + } + ioaddr = pci_resource_start (pdev, pci_flags & PCI_ADDR0 ? 0 : 1); if (pci_enable_device (pdev)) { printk (KERN_ERR "unable to init PCI device (card #%d)\n", card_idx); - goto err_out; + goto err_out_free_dma; } if (pci_flags & PCI_USES_MASTER) @@ -424,16 +462,20 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev, if (dev == NULL) { printk (KERN_ERR "init_ethernet failed for card #%d\n", card_idx); - goto err_out; + goto err_out_free_dma; } - if (!request_region(pci_resource_start (pdev, 0), io_size, dev->name)) { + /* request all PIO and MMIO regions just to make sure + * noone else attempts to use any portion of our I/O space */ + if (!request_region (pci_resource_start (pdev, 0), + pci_resource_len (pdev, 0), dev->name)) { printk (KERN_ERR "request_region failed for device %s, region 0x%X @ 0x%lX\n", dev->name, io_size, pci_resource_start (pdev, 0)); goto err_out_free_netdev; } - if (!request_mem_region(pci_resource_start (pdev, 1), io_size, dev->name)) { + if (!request_mem_region (pci_resource_start (pdev, 1), + pci_resource_len (pdev, 1), dev->name)) { printk (KERN_ERR "request_mem_region failed for device %s, region 0x%X @ 0x%lX\n", dev->name, io_size, pci_resource_start (pdev, 1)); @@ -469,6 +511,11 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev, np = dev->priv; spin_lock_init (&np->lock); np->chip_id = chip_id; + np->pdev = pdev; + np->rx_ring = ring; + np->tx_ring = ring + RX_RING_SIZE * sizeof(struct rx_desc); + np->rx_ring_dma = ring_dma; + np->tx_ring_dma = ring_dma + RX_RING_SIZE * sizeof(struct rx_desc); if (dev->mem_start) option = dev->mem_start; @@ -523,13 +570,20 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev, * so additional exit conditions above this must move * release_mem_region outside of the ifdef */ err_out_free_mmio: - release_mem_region(pci_resource_start (pdev, 1), io_size)); + release_mem_region(pci_resource_start (pdev, 1), + pci_resource_len (pdev, 1)); #endif err_out_free_pio: - release_region(pci_resource_start (pdev, 0), io_size); + release_region(pci_resource_start (pdev, 0), + pci_resource_len (pdev, 0)); err_out_free_netdev: unregister_netdev (dev); kfree (dev); +err_out_free_dma: + pci_free_consistent(pdev, + RX_RING_SIZE * sizeof(struct rx_desc) + + TX_RING_SIZE * sizeof(struct tx_desc), + ring, ring_dma); err_out: return -ENODEV; } @@ -581,22 +635,24 @@ static int via_rhine_open(struct net_device *dev) long ioaddr = dev->base_addr; int i; + MOD_INC_USE_COUNT; + /* Reset the chip. */ writew(CmdReset, ioaddr + ChipCmd); - if (request_irq(dev->irq, &via_rhine_interrupt, SA_SHIRQ, dev->name, dev)) - return -EAGAIN; + if (request_irq(dev->irq, &via_rhine_interrupt, SA_SHIRQ, dev->name, dev)) { + MOD_DEC_USE_COUNT; + return -EBUSY; + } if (debug > 1) printk(KERN_DEBUG "%s: via_rhine_open() irq %d.\n", dev->name, dev->irq); - MOD_INC_USE_COUNT; - via_rhine_init_ring(dev); - writel(virt_to_bus(np->rx_ring), ioaddr + RxRingPtr); - writel(virt_to_bus(np->tx_ring), ioaddr + TxRingPtr); + writel(np->rx_ring_dma, ioaddr + RxRingPtr); + writel(np->tx_ring_dma, ioaddr + TxRingPtr); for (i = 0; i < 6; i++) writeb(dev->dev_addr[i], ioaddr + StationAddr + i); @@ -606,7 +662,7 @@ static int via_rhine_open(struct net_device *dev) /* Configure the FIFO thresholds. */ writeb(0x20, ioaddr + TxConfig); /* Initial threshold 32 bytes */ np->tx_thresh = 0x20; - np->rx_thresh = 0x60; /* Written in via_rhine_set_rx_mode(). */ + np->rx_thresh = 0x60; /* Written in via_rhine_set_rx_mode(). */ if (dev->if_port == 0) dev->if_port = np->default_port; @@ -728,11 +784,12 @@ static void via_rhine_init_ring(struct net_device *dev) for (i = 0; i < RX_RING_SIZE; i++) { np->rx_ring[i].rx_status = 0; np->rx_ring[i].desc_length = cpu_to_le32(np->rx_buf_sz); - np->rx_ring[i].next_desc = virt_to_le32desc(&np->rx_ring[i+1]); + np->rx_ring[i].next_desc = + cpu_to_le32(np->rx_ring_dma + sizeof(struct rx_desc)*(i+1)); np->rx_skbuff[i] = 0; } /* Mark the last entry as wrapping the ring. */ - np->rx_ring[i-1].next_desc = virt_to_le32desc(&np->rx_ring[0]); + np->rx_ring[i-1].next_desc = cpu_to_le32(np->rx_ring_dma); /* Fill in the Rx buffers. */ for (i = 0; i < RX_RING_SIZE; i++) { @@ -740,19 +797,25 @@ static void via_rhine_init_ring(struct net_device *dev) np->rx_skbuff[i] = skb; if (skb == NULL) break; - skb->dev = dev; /* Mark as being used by this device. */ - np->rx_ring[i].addr = virt_to_le32desc(skb->tail); + skb->dev = dev; /* Mark as being used by this device. */ + + np->rx_skbuff_dma[i] = + pci_map_single(np->pdev, skb->tail, np->rx_buf_sz, + PCI_DMA_FROMDEVICE); + + np->rx_ring[i].addr = cpu_to_le32(np->rx_skbuff_dma[i]); np->rx_ring[i].rx_status = cpu_to_le32(DescOwn); } for (i = 0; i < TX_RING_SIZE; i++) { np->tx_skbuff[i] = 0; np->tx_ring[i].tx_status = 0; - np->tx_ring[i].desc_length = 0x00e08000; - np->tx_ring[i].next_desc = virt_to_le32desc(&np->tx_ring[i+1]); + np->tx_ring[i].desc_length = cpu_to_le32(0x00e08000); + np->tx_ring[i].next_desc = + cpu_to_le32(np->tx_ring_dma + sizeof(struct tx_desc)*(i+1)); np->tx_buf[i] = kmalloc(PKT_BUF_SZ, GFP_KERNEL); } - np->tx_ring[i-1].next_desc = virt_to_le32desc(&np->tx_ring[0]); + np->tx_ring[i-1].next_desc = cpu_to_le32(np->tx_ring_dma); return; } @@ -781,9 +844,15 @@ static int via_rhine_start_tx(struct sk_buff *skb, struct net_device *dev) return 1; } memcpy(np->tx_buf[entry], skb->data, skb->len); - np->tx_ring[entry].addr = virt_to_le32desc(np->tx_buf[entry]); - } else - np->tx_ring[entry].addr = virt_to_le32desc(skb->data); + np->tx_skbuff_dma[entry] = + pci_map_single(np->pdev, np->tx_buf[entry], skb->len, + PCI_DMA_TODEVICE); + } else { + np->tx_skbuff_dma[entry] = + pci_map_single(np->pdev, skb->data, skb->len, + PCI_DMA_TODEVICE); + } + np->tx_ring[entry].addr = cpu_to_le32(np->tx_skbuff_dma[entry]); np->tx_ring[entry].desc_length = cpu_to_le32(0x00E08000 | (skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN)); @@ -884,10 +953,13 @@ static void via_rhine_tx(struct net_device *dev) /* Transmitter restarted in 'abnormal' handler. */ } else { np->stats.collisions += (txstatus >> 3) & 15; - np->stats.tx_bytes += np->tx_ring[entry].desc_length & 0x7ff; + np->stats.tx_bytes += le32_to_cpu(np->tx_ring[entry].desc_length) & 0x7ff; np->stats.tx_packets++; } /* Free the original skb. */ + pci_unmap_single(np->pdev, + le32_to_cpu(np->tx_ring[entry].addr), + np->tx_skbuff[entry]->len, PCI_DMA_TODEVICE); dev_kfree_skb_irq(np->tx_skbuff[entry]); np->tx_skbuff[entry] = NULL; entry = (++np->dirty_tx) % TX_RING_SIZE; @@ -908,7 +980,7 @@ static void via_rhine_rx(struct net_device *dev) if (debug > 4) { printk(KERN_DEBUG " In via_rhine_rx(), entry %d status %8.8x.\n", - entry, np->rx_head_desc->rx_status); + entry, le32_to_cpu(np->rx_head_desc->rx_status)); } /* If EOP is set on the next entry, it's a new packet. Send it up. */ @@ -928,8 +1000,7 @@ static void via_rhine_rx(struct net_device *dev) "multiple buffers, entry %#x length %d status %8.8x!\n", dev->name, entry, data_size, desc_status); printk(KERN_WARNING "%s: Oversized Ethernet frame %p vs %p.\n", - dev->name, np->rx_head_desc, - &np->rx_ring[entry]); + dev->name, np->rx_head_desc, &np->rx_ring[entry]); np->stats.rx_length_errors++; } else if (desc_status & RxErr) { /* There was a error. */ @@ -949,20 +1020,30 @@ static void via_rhine_rx(struct net_device *dev) /* Check if the packet is long enough to accept without copying to a minimally-sized skbuff. */ - if (pkt_len < rx_copybreak - && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { + if (pkt_len < rx_copybreak && + (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { skb->dev = dev; skb_reserve(skb, 2); /* 16 byte align the IP header */ + pci_dma_sync_single(np->pdev, np->rx_skbuff_dma[entry], + np->rx_buf_sz, PCI_DMA_FROMDEVICE); #if ! defined(__alpha__) || USE_IP_COPYSUM /* Avoid misaligned on Alpha */ - eth_copy_and_sum(skb, bus_to_virt(desc->addr), - pkt_len, 0); + eth_copy_and_sum(skb, np->rx_skbuff[entry]->tail, pkt_len, 0); skb_put(skb, pkt_len); #else - memcpy(skb_put(skb,pkt_len), bus_to_virt(desc->addr), pkt_len); + memcpy(skb_put(skb, pkt_len), np->rx_skbuff[entry]->tail, + pkt_len); #endif } else { - skb_put(skb = np->rx_skbuff[entry], pkt_len); + skb = np->rx_skbuff[entry]; + if (skb == NULL) { + printk(KERN_ERR "%s: Inconsistent Rx descriptor chain.\n", + dev->name); + break; + } np->rx_skbuff[entry] = NULL; + skb_put(skb, pkt_len); + pci_unmap_single(np->pdev, np->rx_skbuff_dma[entry], + np->rx_buf_sz, PCI_DMA_FROMDEVICE); } skb->protocol = eth_type_trans(skb, dev); netif_rx(skb); @@ -984,7 +1065,10 @@ static void via_rhine_rx(struct net_device *dev) if (skb == NULL) break; /* Better luck next round. */ skb->dev = dev; /* Mark as being used by this device. */ - np->rx_ring[entry].addr = virt_to_le32desc(skb->tail); + np->rx_skbuff_dma[entry] = + pci_map_single(np->pdev, skb->tail, np->rx_buf_sz, + PCI_DMA_FROMDEVICE); + np->rx_ring[entry].addr = cpu_to_le32(np->rx_skbuff_dma[entry]); } np->rx_ring[entry].rx_status = cpu_to_le32(DescOwn); } @@ -1147,12 +1231,16 @@ static int via_rhine_close(struct net_device *dev) /* Free all the skbuffs in the Rx queue. */ for (i = 0; i < RX_RING_SIZE; i++) { np->rx_ring[i].rx_status = 0; - np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */ + np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */ if (np->rx_skbuff[i]) { + pci_unmap_single(np->pdev, + np->rx_skbuff_dma[i], + np->rx_buf_sz, PCI_DMA_FROMDEVICE); dev_kfree_skb(np->rx_skbuff[i]); } np->rx_skbuff[i] = 0; } + for (i = 0; i < TX_RING_SIZE; i++) { if (np->tx_skbuff[i]) dev_kfree_skb(np->tx_skbuff[i]); @@ -1173,14 +1261,19 @@ static void __devexit via_rhine_remove_one (struct pci_dev *pdev) unregister_netdev(dev); release_region(pci_resource_start (pdev, 0), - via_rhine_chip_info[np->chip_id].io_size); + pci_resource_len (pdev, 0)); release_mem_region(pci_resource_start (pdev, 1), - via_rhine_chip_info[np->chip_id].io_size); + pci_resource_len (pdev, 1)); #ifndef USE_IO iounmap((char *)(dev->base_addr)); #endif + pci_free_consistent(pdev, + RX_RING_SIZE * sizeof(struct rx_desc) + + TX_RING_SIZE * sizeof(struct tx_desc), + np->rx_ring, np->rx_ring_dma); + kfree(dev); } @@ -1195,7 +1288,15 @@ static struct pci_driver via_rhine_driver = { static int __init via_rhine_init (void) { - return pci_module_init (&via_rhine_driver); + int rc; + + MOD_INC_USE_COUNT; + + rc = pci_module_init (&via_rhine_driver); + + MOD_DEC_USE_COUNT; + + return rc; } diff --git a/drivers/usb/uhci.c b/drivers/usb/uhci.c index 28117e4fa3ad..9927b5382efb 100644 --- a/drivers/usb/uhci.c +++ b/drivers/usb/uhci.c @@ -1315,8 +1315,8 @@ static __u8 root_hub_dev_des[] = 0x00, /* __u16 bcdDevice; */ 0x00, 0x00, /* __u8 iManufacturer; */ - 0x00, /* __u8 iProduct; */ - 0x00, /* __u8 iSerialNumber; */ + 0x02, /* __u8 iProduct; */ + 0x01, /* __u8 iSerialNumber; */ 0x01 /* __u8 bNumConfigurations; */ }; @@ -1617,7 +1617,13 @@ static int rh_submit_urb(urb_t *urb) memcpy (data, root_hub_config_des, len); OK(len); case 0x03: /* string descriptors */ - stat = -EPIPE; + len = usb_root_hub_string (wValue & 0xff, + uhci->io_addr, "UHCI", + data, wLength); + if (len > 0) { + OK (min (leni, len)); + } else + stat = -EPIPE; } break; case RH_GET_DESCRIPTOR | RH_CLASS: diff --git a/drivers/usb/usb-ohci.c b/drivers/usb/usb-ohci.c index b7882ac8aca6..b134107da0d2 100644 --- a/drivers/usb/usb-ohci.c +++ b/drivers/usb/usb-ohci.c @@ -339,10 +339,11 @@ static int sohci_submit_urb (urb_t * urb) (le16_to_cpu (ohci->hcca.frame_no) + 10)) & 0xffff; } - td_submit_urb (urb); /* fill the TDs and link it to the ed */ - if (ed->state != ED_OPER) /* link the ed into a chain if is not already */ ep_link (ohci, ed); + + td_submit_urb (urb); /* fill the TDs and link it to the ed */ + spin_unlock_irqrestore (&usb_ed_lock, flags); urb->status = USB_ST_URB_PENDING; @@ -1128,8 +1129,8 @@ static __u8 root_hub_dev_des[] = 0x00, /* __u16 bcdDevice; */ 0x00, 0x00, /* __u8 iManufacturer; */ - 0x00, /* __u8 iProduct; */ - 0x00, /* __u8 iSerialNumber; */ + 0x02, /* __u8 iProduct; */ + 0x01, /* __u8 iSerialNumber; */ 0x01 /* __u8 bNumConfigurations; */ }; @@ -1388,6 +1389,14 @@ static int rh_submit_urb (urb_t * urb) len = min (leni, min (sizeof (root_hub_config_des), wLength)); data_buf = root_hub_config_des; OK(len); case (0x03): /* string descriptors */ + len = usb_root_hub_string (wValue & 0xff, + (int) ohci->regs, "OHCI", + data, wLength); + if (len > 0) { + data_buf = data; + OK (min (leni, len)); + } + // else fallthrough default: status = TD_CC_STALL; } @@ -1436,7 +1445,8 @@ static int rh_submit_urb (urb_t * urb) dbg("USB HC roothubstat2: %x", readl ( &(ohci->regs->roothub.portstatus[1]) )); len = min(len, leni); - memcpy (data, data_buf, len); + if (data != data_buf) + memcpy (data, data_buf, len); urb->actual_length = len; urb->status = cc_to_error [status]; diff --git a/drivers/usb/usb-storage.c b/drivers/usb/usb-storage.c index 0cac2ef13fac..d1b77c8f5555 100644 --- a/drivers/usb/usb-storage.c +++ b/drivers/usb/usb-storage.c @@ -3,20 +3,19 @@ * (c) 1999 Michael Gee (michael@linuxspecific.com) * (c) 1999, 2000 Matthew Dharm (mdharm-usb@one-eyed-alien.net) * - * Further reference: - * This driver is based on the 'USB Mass Storage Class' document. This - * describes in detail the protocol used to communicate with such - * devices. Clearly, the designers had SCSI and ATAPI commands in mind - * when they created this document. The commands are all very similar - * to commands in the SCSI-II and ATAPI specifications. + * This driver is based on the 'USB Mass Storage Class' document. This + * describes in detail the protocol used to communicate with such + * devices. Clearly, the designers had SCSI and ATAPI commands in + * mind when they created this document. The commands are all very + * similar to commands in the SCSI-II and ATAPI specifications. * - * It is important to note that in a number of cases this class exhibits - * class-specific exemptions from the USB specification. Notably the - * usage of NAK, STALL and ACK differs from the norm, in that they are - * used to communicate wait, failed and OK on commands. - * Also, for certain devices, the interrupt endpoint is used to convey - * status of a command. + * It is important to note that in a number of cases this class + * exhibits class-specific exemptions from the USB specification. + * Notably the usage of NAK, STALL and ACK differs from the norm, in + * that they are used to communicate wait, failed and OK on commands. * + * Also, for certain devices, the interrupt endpoint is used to convey + * status of a command. */ #include @@ -40,7 +39,6 @@ #include "usb-storage.h" #include "usb-storage-debug.h" - /* * This is the size of the structure Scsi_Host_Template. We create * an instance of this structure in this file and this is a check @@ -75,34 +73,47 @@ typedef int (*trans_cmnd)(Scsi_Cmnd*, struct us_data*); typedef int (*trans_reset)(struct us_data*); typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*); +/* we allocate one of these for every device that we remember */ struct us_data { struct us_data *next; /* next device */ struct usb_device *pusb_dev; /* this usb_device */ unsigned int flags; /* from filter initially */ + + /* information about the device -- only good if device is attached */ __u8 ifnum; /* interface number */ __u8 ep_in; /* in endpoint */ __u8 ep_out; /* out ....... */ __u8 ep_int; /* interrupt . */ - __u8 subclass; /* as in overview */ - __u8 protocol; /* .............. */ - trans_cmnd transport; /* protocol specific do cmd */ - trans_reset transport_reset; /* .......... device reset */ + __u8 subclass; + __u8 protocol; + + /* function pointers for this device */ + trans_cmnd transport; /* transport function */ + trans_reset transport_reset; /* transport device reset */ proto_cmnd proto_handler; /* protocol handler */ + + /* SCSI interfaces */ GUID(guid); /* unique dev id */ struct Scsi_Host *host; /* our dummy host data */ Scsi_Host_Template htmplt; /* own host template */ int host_number; /* to find us */ int host_no; /* allocated by scsi */ Scsi_Cmnd *srb; /* current srb */ + + /* thread information */ Scsi_Cmnd *queue_srb; /* the single queue slot */ int action; /* what to do */ + int pid; /* control thread */ + + /* interrupt info for CBI devices */ struct semaphore ip_waitq; /* for CBI interrupts */ __u16 ip_data; /* interrupt data */ int ip_wanted; /* needed */ - int pid; /* control thread */ - struct semaphore *notify; /* wait for thread to begin */ void *irq_handle; /* for USB int requests */ unsigned int irqpipe; /* pipe for release_irq */ + + /* mutual exclusion structures */ + struct semaphore notify; /* wait for thread to begin */ struct semaphore sleeper; /* to sleep on */ struct semaphore queue_exclusion; /* to protect data structs */ }; @@ -116,6 +127,7 @@ struct us_data { #define US_ACT_DEVICE_RESET 3 #define US_ACT_BUS_RESET 4 #define US_ACT_HOST_RESET 5 +#define US_ACT_EXIT 6 /* The list of structures and the protective lock for them */ static struct us_data *us_list; @@ -254,11 +266,6 @@ static unsigned int us_transfer_length(Scsi_Cmnd *srb) case MODE_SENSE: return srb->cmnd[4]; - /* FIXME: this needs to come out when the other - * fix is in place */ - case READ_CAPACITY: - return 8; - /* FIXME: these should be removed and tested */ case LOG_SENSE: case MODE_SENSE_10: @@ -791,9 +798,8 @@ static int CBI_transport(Scsi_Cmnd *srb, struct us_data *us) us->ifnum, srb->cmnd, srb->cmd_len, HZ*5); /* check the return code for the command */ + US_DEBUGP("Call to usb_control_msg() returned %d\n", result); if (result < 0) { - US_DEBUGP("Call to usb_control_msg() returned %d\n", result); - /* a stall is a fatal condition from the device */ if (result == -EPIPE) { US_DEBUGP("-- Stall on control pipe. Clearing\n"); @@ -820,15 +826,10 @@ static int CBI_transport(Scsi_Cmnd *srb, struct us_data *us) /* STATUS STAGE */ - /* go to sleep until we get this interrup */ - /* FIXME: this should be changed to use a timeout -- or let the - * device reset routine up() this for us to unjam us - */ + /* go to sleep until we get this interrupt */ down(&(us->ip_waitq)); - /* FIXME: currently this code is unreachable, but the idea is - * necessary. See above comment. - */ + /* if we were woken up by a reset instead of the actual interrupt */ if (us->ip_wanted) { US_DEBUGP("Did not get interrupt on CBI\n"); us->ip_wanted = 0; @@ -837,8 +838,9 @@ static int CBI_transport(Scsi_Cmnd *srb, struct us_data *us) US_DEBUGP("Got interrupt data 0x%x\n", us->ip_data); - /* UFI gives us ASC and ASCQ, like a request sense */ - /* REQUEST_SENSE and INQUIRY don't affect the sense data, so we + /* UFI gives us ASC and ASCQ, like a request sense + * + * REQUEST_SENSE and INQUIRY don't affect the sense data, so we * ignore the information for those commands */ if (us->subclass == US_SC_UFI) { @@ -1114,29 +1116,27 @@ static int us_detect(struct SHT *sht) static int us_release(struct Scsi_Host *psh) { struct us_data *us = (struct us_data *)psh->hostdata[0]; - struct us_data *prev; unsigned long flags; + int result; + /* lock the data structures */ + spin_lock_irqsave(&us_list_spinlock, flags); + + US_DEBUGP("us_release() called for host %s\n", us->htmplt.name); + + /* release the interrupt handler, if necessary */ if (us->irq_handle) { - usb_release_irq(us->pusb_dev, us->irq_handle, us->irqpipe); + US_DEBUGP("-- releasing irq\n"); + result = usb_release_irq(us->pusb_dev, us->irq_handle, + us->irqpipe); + US_DEBUGP("-- usb_release_irq() returned %d\n", result); us->irq_handle = NULL; } - /* FIXME: release the interface claim here? */ - - /* FIXME: we need to move this elsewhere -- - * the remove function only gets called to remove the module - */ - spin_lock_irqsave(&us_list_spinlock, flags); - if (us_list == us) - us_list = us->next; - else { - prev = us_list; - while (prev->next != us) - prev = prev->next; - prev->next = us->next; - } + /* lock the data structures */ spin_unlock_irqrestore(&us_list_spinlock, flags); + + /* we always have a successful release */ return 0; } @@ -1153,7 +1153,7 @@ static int us_queuecommand( Scsi_Cmnd *srb , void (*done)(Scsi_Cmnd *)) { struct us_data *us = (struct us_data *)srb->host->hostdata[0]; - US_DEBUGP("Command wakeup\n"); + US_DEBUGP("us_queuecommand() called\n"); srb->host_scribble = (unsigned char *)us; /* get exclusive access to the structures we want */ @@ -1180,9 +1180,11 @@ static int us_abort( Scsi_Cmnd *srb ) /* FIXME: this doesn't do anything right now */ static int us_bus_reset( Scsi_Cmnd *srb ) { - // struct us_data *us = (struct us_data *)srb->host->hostdata[0]; + struct us_data *us = (struct us_data *)srb->host->hostdata[0]; US_DEBUGP("Bus reset requested\n"); + if (us->ip_wanted) + up(&(us->ip_waitq)); // us->transport_reset(us); return SUCCESS; } @@ -1364,12 +1366,9 @@ static int usb_stor_control_thread(void * __us) unlock_kernel(); - up(us->notify); + up(&(us->notify)); for(;;) { - siginfo_t info; - int unsigned long signr; - US_DEBUGP("*** thread sleeping.\n"); down(&(us->sleeper)); down(&(us->queue_exclusion)); @@ -1378,7 +1377,7 @@ static int usb_stor_control_thread(void * __us) /* take the command off the queue */ action = us->action; us->action = 0; - us->srb = us-> queue_srb; + us->srb = us->queue_srb; /* release the queue lock as fast as possible */ up(&(us->queue_exclusion)); @@ -1433,7 +1432,8 @@ static int usb_stor_control_thread(void * __us) us->proto_handler(us->srb, us); } - US_DEBUGP("scsi cmd done, result=0x%x\n", us->srb->result); + US_DEBUGP("scsi cmd done, result=0x%x\n", + us->srb->result); us->srb->scsi_done(us->srb); us->srb = NULL; break; @@ -1452,19 +1452,12 @@ static int usb_stor_control_thread(void * __us) } /* end switch on action */ - /* FIXME: we ignore TERM and KILL... is this right? */ - if (signal_pending(current)) { - /* sending SIGUSR1 makes us print out some info */ - spin_lock_irq(¤t->sigmask_lock); - signr = dequeue_signal(¤t->blocked, &info); - spin_unlock_irq(¤t->sigmask_lock); - } /* if (singal_pending(current)) */ + /* exit if we get a signal to exit */ + if (action == US_ACT_EXIT) + break; } /* for (;;) */ - // MOD_DEC_USE_COUNT; - printk("usb_stor_control_thread exiting\n"); - return 0; } @@ -1495,14 +1488,12 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) /* FIXME: this isn't quite right... */ /* We make an exception for the shuttle E-USB */ - if (dev->descriptor.idVendor == 0x04e6 && - dev->descriptor.idProduct == 0x0001) { - protocol = US_PR_CB; - subclass = US_SC_8070; /* an assumption */ - } else if (dev->descriptor.bDeviceClass != 0 || - altsetting->bInterfaceClass != USB_CLASS_MASS_STORAGE || - altsetting->bInterfaceSubClass < US_SC_MIN || - altsetting->bInterfaceSubClass > US_SC_MAX) { + if (!(dev->descriptor.idVendor == 0x04e6 && + dev->descriptor.idProduct == 0x0001) && + !(dev->descriptor.bDeviceClass == 0 && + altsetting->bInterfaceClass == USB_CLASS_MASS_STORAGE && + altsetting->bInterfaceSubClass >= US_SC_MIN && + altsetting->bInterfaceSubClass <= US_SC_MAX)) { /* if it's not a mass storage, we go no further */ return NULL; } @@ -1510,7 +1501,43 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) /* At this point, we know we've got a live one */ US_DEBUGP("USB Mass Storage device detected\n"); + /* Determine subclass and protocol, or copy from the interface */ + /* FIXME: this isn't quite right */ + if (dev->descriptor.idVendor == 0x04e6 && + dev->descriptor.idProduct == 0x0001) { + protocol = US_PR_CB; + subclass = US_SC_8070; /* an assumption */ + } else { + subclass = altsetting->bInterfaceSubClass; + protocol = altsetting->bInterfaceProtocol; + } + + /* shuttle E-USB */ + /* FIXME: all we should need to do here is determine the protocol */ + if (dev->descriptor.idVendor == 0x04e6 && + dev->descriptor.idProduct == 0x0001) { + __u8 qstat[2]; + + result = usb_control_msg(ss->pusb_dev, + usb_rcvctrlpipe(dev,0), + 1, 0xC0, + 0, ss->ifnum, + qstat, 2, HZ*5); + US_DEBUGP("C0 status 0x%x 0x%x\n", qstat[0], qstat[1]); + init_MUTEX_LOCKED(&(ss->ip_waitq)); + ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int); + result = usb_request_irq(ss->pusb_dev, ss->irqpipe, + CBI_irq, 255, (void *)ss, + &ss->irq_handle); + if (result < 0) + return NULL; + + /* FIXME: what is this?? */ + down(&(ss->ip_waitq)); + } + /* + * Find the endpoints we need * We are expecting a minimum of 2 endpoints - in and out (bulk). * An optional interrupt is OK (necessary for CBI protocol). * We will ignore any others. @@ -1519,6 +1546,7 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) /* is it an BULK endpoint? */ if ((altsetting->endpoint[i].bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) { + /* BULK in or out? */ if (altsetting->endpoint[i].bEndpointAddress & USB_DIR_IN) ep_in = altsetting->endpoint[i].bEndpointAddress & @@ -1542,36 +1570,14 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) result = usb_set_interface(dev, altsetting->bInterfaceNumber, 0); US_DEBUGP("Result from usb_set_interface is %d\n", result); if (result == -EPIPE) { + US_DEBUGP("-- clearing stall on control interface\n"); usb_clear_halt(dev, usb_sndctrlpipe(dev, 0)); } else if (result != 0) { /* it's not a stall, but another error -- time to bail */ + US_DEBUGP("-- unknown error. rejecting device\n"); return NULL; } - /* shuttle E-USB */ - /* FIXME: all we should need to do here is determine the protocol */ - if (dev->descriptor.idVendor == 0x04e6 && - dev->descriptor.idProduct == 0x0001) { - __u8 qstat[2]; - - result = usb_control_msg(ss->pusb_dev, - usb_rcvctrlpipe(dev,0), - 1, 0xC0, - 0, ss->ifnum, - qstat, 2, HZ*5); - US_DEBUGP("C0 status 0x%x 0x%x\n", qstat[0], qstat[1]); - init_MUTEX_LOCKED(&(ss->ip_waitq)); - ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int); - result = usb_request_irq(ss->pusb_dev, ss->irqpipe, - CBI_irq, 255, (void *)ss, - &ss->irq_handle); - if (result < 0) - return NULL; - - /* FIXME: what is this?? */ - down(&(ss->ip_waitq)); - } - /* Do some basic sanity checks, and bail if we find a problem */ if (!ep_in || !ep_out || (protocol == US_PR_CBI && !ep_int)) { US_DEBUGP("Problems with device\n"); @@ -1638,8 +1644,8 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) US_DEBUGP("Allocating IRQ for CBI transport\n"); ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int); result = usb_request_irq(ss->pusb_dev, ss->irqpipe, - CBI_irq, 255, - (void *)ss, &ss->irq_handle); + CBI_irq, 255, (void *)ss, + &(ss->irq_handle)); US_DEBUGP("usb_request_irq returned %d\n", result); } } else { @@ -1656,23 +1662,12 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) /* Initialize the mutexes only when the struct is new */ init_MUTEX_LOCKED(&(ss->sleeper)); + init_MUTEX_LOCKED(&(ss->notify)); init_MUTEX(&(ss->queue_exclusion)); - /* - * If we've allready determined the subclass and protocol, - * use that. Otherwise, use the interface ones. This - * allows us to support devices which are compliant but - * don't announce it. Note that this information is - * maintained in the us_data struct so we only have to do - * this for new devices. - */ - if (subclass) { - ss->subclass = subclass; - ss->protocol = protocol; - } else { - ss->subclass = altsetting->bInterfaceSubClass; - ss->protocol = altsetting->bInterfaceProtocol; - } + /* copy over the subclass and protocol data */ + ss->subclass = subclass; + ss->protocol = protocol; /* copy over the endpoint data */ ss->ep_in = ep_in; @@ -1762,9 +1757,9 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) US_DEBUGP("Allocating IRQ for CBI transport\n"); ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int); result = usb_request_irq(ss->pusb_dev, ss->irqpipe, - CBI_irq, 255, - (void *)ss, &ss->irq_handle); - US_DEBUGP("usb_request_irq returned %d", result); + CBI_irq, 255, (void *)ss, + &(ss->irq_handle)); + US_DEBUGP("usb_request_irq returned %d\n", result); } /* @@ -1786,23 +1781,18 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) (struct us_data *)ss->htmplt.proc_dir = ss; /* start up our thread */ - { - DECLARE_MUTEX_LOCKED(sem); - - ss->notify = &sem; - ss->pid = kernel_thread(usb_stor_control_thread, ss, - CLONE_FS | CLONE_FILES | - CLONE_SIGHAND); - if (ss->pid < 0) { - printk(KERN_WARNING USB_STORAGE - "Unable to start control thread\n"); - kfree(ss); - return NULL; - } - - /* wait for it to start */ - down(&sem); + ss->pid = kernel_thread(usb_stor_control_thread, ss, + CLONE_FS | CLONE_FILES | + CLONE_SIGHAND); + if (ss->pid < 0) { + printk(KERN_WARNING USB_STORAGE + "Unable to start control thread\n"); + kfree(ss); + return NULL; } + + /* wait for it to start */ + down(&(ss->notify)); /* now register - our detect function will be called */ ss->htmplt.module = &__this_module; @@ -1829,18 +1819,26 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum) static void storage_disconnect(struct usb_device *dev, void *ptr) { struct us_data *ss = ptr; + int result; - if (!ss) + US_DEBUGP("storage_disconnect() called\n"); + + /* this is the odd case -- we disconnected but weren't using it */ + if (!ss) { + US_DEBUGP("-- device was not in use\n"); return; - - /* FIXME: we need mututal exclusion and resource freeing here */ + } /* release the IRQ, if we have one */ if (ss->irq_handle) { - usb_release_irq(ss->pusb_dev, ss->irq_handle, ss->irqpipe); + US_DEBUGP("-- releasing irq handle\n"); + result = usb_release_irq(ss->pusb_dev, ss->irq_handle, + ss->irqpipe); + US_DEBUGP("-- usb_release_irq() returned %d\n", result); ss->irq_handle = NULL; } + /* mark the device as gone */ ss->pusb_dev = NULL; } @@ -1851,11 +1849,16 @@ static void storage_disconnect(struct usb_device *dev, void *ptr) int __init usb_stor_init(void) { + /* + * Check to see if the host template is a different size from + * what we're expected -- people have updated this in the past + * and forgotten about this driver. + */ if (sizeof(my_host_template) != SCSI_HOST_TEMPLATE_SIZE) { - printk(KERN_ERR "usb-storage: SCSI_HOST_TEMPLATE_SIZE does not match\n") ; - printk(KERN_ERR "usb-storage: expected %d bytes, got %d bytes\n", + printk(KERN_ERR "usb-storage: SCSI_HOST_TEMPLATE_SIZE bad\n"); + printk(KERN_ERR + "usb-storage: expected %d bytes, got %d bytes\n", SCSI_HOST_TEMPLATE_SIZE, sizeof(my_host_template)) ; - return -1 ; } @@ -1863,6 +1866,7 @@ int __init usb_stor_init(void) if (usb_register(&storage_driver) < 0) return -1; + /* we're all set */ printk(KERN_INFO "USB Mass Storage support registered.\n"); return 0; } @@ -1870,17 +1874,35 @@ int __init usb_stor_init(void) void __exit usb_stor_exit(void) { static struct us_data *ptr; - + static struct us_data *next; + unsigned long flags; + + /* + * deregister the driver -- this eliminates races with probes and + * disconnects + */ + usb_deregister(&storage_driver) ; + + /* lock access to the data structures */ + spin_lock_irqsave(&us_list_spinlock, flags); + /* unregister all the virtual hosts */ for (ptr = us_list; ptr != NULL; ptr = ptr->next) - scsi_unregister_module(MODULE_SCSI_HA, &(ptr->htmplt)); - - /* free up the data structures */ - + scsi_unregister_module(MODULE_SCSI_HA, &(ptr->htmplt)); + /* kill the threads */ + /* FIXME: we can do this by sending them a signal to die */ - /* deregister the driver */ - usb_deregister(&storage_driver) ; + /* free up the data structures */ + /* FIXME: we need to eliminate the host structure also */ + while (ptr) { + next = ptr->next; + kfree(ptr); + ptr = next; + } + + /* unlock the data structures */ + spin_unlock_irqrestore(&us_list_spinlock, flags); } module_init(usb_stor_init) ; diff --git a/drivers/usb/usb-uhci.c b/drivers/usb/usb-uhci.c index 1d8240a0ac04..f77296d7ffcf 100644 --- a/drivers/usb/usb-uhci.c +++ b/drivers/usb/usb-uhci.c @@ -1002,8 +1002,11 @@ _static int uhci_unlink_urb_sync (uhci_t *s, urb_t *urb) urb_priv = urb->hcpriv; switch (usb_pipetype (urb->pipe)) { - case PIPE_ISOCHRONOUS: + case PIPE_INTERRUPT: + usb_dotoggle (urb->dev, usb_pipeendpoint (urb->pipe), usb_pipeout (urb->pipe)); + + case PIPE_ISOCHRONOUS: uhci_clean_iso_step1(s, urb_priv); uhci_wait_ms(1); uhci_clean_iso_step2(s, urb_priv); @@ -1131,8 +1134,10 @@ _static int uhci_unlink_urb_async (uhci_t *s,urb_t *urb) urb_priv = (urb_priv_t*)urb->hcpriv; switch (usb_pipetype (urb->pipe)) { - case PIPE_ISOCHRONOUS: case PIPE_INTERRUPT: + usb_dotoggle (urb->dev, usb_pipeendpoint (urb->pipe), usb_pipeout (urb->pipe)); + + case PIPE_ISOCHRONOUS: uhci_clean_iso_step1 (s, urb_priv); break; @@ -1617,8 +1622,8 @@ _static __u8 root_hub_dev_des[] = 0x00, /* __u16 bcdDevice; */ 0x00, 0x00, /* __u8 iManufacturer; */ - 0x00, /* __u8 iProduct; */ - 0x00, /* __u8 iSerialNumber; */ + 0x02, /* __u8 iProduct; */ + 0x01, /* __u8 iSerialNumber; */ 0x01 /* __u8 bNumConfigurations; */ }; @@ -1915,8 +1920,14 @@ _static int rh_submit_urb (urb_t *urb) len = min (leni, min (sizeof (root_hub_config_des), wLength)); memcpy (data, root_hub_config_des, len); OK (len); - case (0x03): /*string descriptors */ - stat = -EPIPE; + case (0x03): /* string descriptors */ + len = usb_root_hub_string (wValue & 0xff, + uhci->io_addr, "UHCI", + data, wLength); + if (len > 0) { + OK (min (leni, len)); + } else + stat = -EPIPE; } break; diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c index df8fe9b38f2d..9b2d38b6f779 100644 --- a/drivers/usb/usb.c +++ b/drivers/usb/usb.c @@ -1184,6 +1184,54 @@ void usb_init_root_hub(struct usb_device *dev) dev->actconfig = NULL; } +/* for returning string descriptors in UTF-16LE */ +static int ascii2utf (char *ascii, __u8 *utf, int utfmax) +{ + int retval; + + for (retval = 0; *ascii && utfmax > 1; utfmax -= 2, retval += 2) { + *utf++ = *ascii++ & 0x7f; + *utf++ = 0; + } + return retval; +} + +/* + * root_hub_string is used by each host controller's root hub code, + * so that they're identified consistently throughout the system. + */ +int usb_root_hub_string (int id, int serial, char *type, __u8 *data, int len) +{ + char buf [20]; + + // assert (len > (2 * (sizeof (buf) + 1))); + // assert (strlen (type) ~== 4); + + // language ids + if (id == 0) { + *data++ = 4; *data++ = 3; /* 4 bytes data */ + *data++ = 0; *data++ = 0; /* some language id */ + return 4; + + // serial number + } else if (id == 1) { + sprintf (buf, "%x", serial); + + // product description + } else if (id == 2) { + sprintf (buf, "USB %s Root Hub", type); + + // id 3 == vendor description + + // unsupported IDs --> "stall" + } else + return 0; + + data [0] = 2 + ascii2utf (buf, data + 2, len - 2); + data [1] = 3; + return data [0]; +} + /* * __usb_get_extra_descriptor() finds a descriptor of specific type in the * extra field of the interface and endpoint descriptor structs. @@ -1824,6 +1872,7 @@ EXPORT_SYMBOL(usb_interface_claimed); EXPORT_SYMBOL(usb_driver_release_interface); EXPORT_SYMBOL(usb_init_root_hub); +EXPORT_SYMBOL(usb_root_hub_string); EXPORT_SYMBOL(usb_new_device); EXPORT_SYMBOL(usb_connect); EXPORT_SYMBOL(usb_disconnect); diff --git a/fs/dcache.c b/fs/dcache.c index 2d6c97340c93..d4aef49e7204 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -269,6 +269,8 @@ void shrink_dcache_sb(struct super_block * sb) struct list_head *tmp, *next; struct dentry *dentry; + check_lock(); + /* * Pass one ... move the dentries for the specified * superblock to the most recent end of the unused list. @@ -316,6 +318,8 @@ int is_root_busy(struct dentry *root) struct list_head *next; int count = root->d_count; + check_lock(); + repeat: next = this_parent->d_subdirs.next; resume: @@ -395,6 +399,8 @@ static int select_parent(struct dentry * parent) struct list_head *next; int found = 0; + check_lock(); + repeat: next = this_parent->d_subdirs.next; resume: @@ -657,6 +663,8 @@ void d_delete(struct dentry * dentry) { check_lock(); + check_lock(); + /* * Are we the only user? */ diff --git a/fs/exec.c b/fs/exec.c index a8e135d5b2c2..8a8a106313bd 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -328,12 +328,16 @@ struct file *open_exec(const char *name) if (dentry->d_inode && S_ISREG(dentry->d_inode->i_mode)) { int err = permission(dentry->d_inode, MAY_EXEC); file = ERR_PTR(err); - if (!err) + if (!err) { file = dentry_open(dentry, O_RDONLY); +out: + unlock_kernel(); + return file; + } } + dput(dentry); } - unlock_kernel(); - return file; + goto out; } int kernel_read(struct file *file, unsigned long offset, diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 9f8898839fbb..3ca2401295e0 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -596,12 +596,12 @@ static int nfs_lookup_revalidate(struct dentry * dentry, int flags) out_valid: return 1; out_bad: - d_drop(dentry); if (!list_empty(&dentry->d_subdirs)) shrink_dcache_parent(dentry); /* If we have submounts, don't unhash ! */ if (have_submounts(dentry)) goto out_valid; + d_drop(dentry); /* Purge readdir caches. */ if (dentry->d_parent->d_inode) { nfs_zap_caches(dentry->d_parent->d_inode); @@ -914,7 +914,7 @@ dentry->d_parent->d_name.name, dentry->d_name.name); dfprintk(VFS, "trying to rename %s to %s\n", dentry->d_name.name, silly); - sdentry = lookup_one(silly, dentry->d_parent); + sdentry = lookup_one(silly, dget(dentry->d_parent)); /* * N.B. Better to return EBUSY here ... it could be * dangerous to delete the file while it's in use. diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index 88ac4f233c44..5ad2aaa67418 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c @@ -9,7 +9,6 @@ #define NFS_NEED_XDR_TYPES -#include #include #include #include diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index 66a69c7a0384..92eed75596f7 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -1,4 +1,4 @@ -/* $Id: inode.c,v 1.9 2000/03/13 21:59:43 davem Exp $ +/* $Id: inode.c,v 1.10 2000/03/24 01:32:51 davem Exp $ * openpromfs.c: /proc/openprom handling routines * * Copyright (C) 1996-1999 Jakub Jelinek (jakub@redhat.com) diff --git a/include/linux/usb.h b/include/linux/usb.h index 8326fb791b4e..c011f8238b93 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -604,6 +604,7 @@ extern void *usb_request_bulk(struct usb_device *, unsigned int, usb_device_irq, extern int usb_terminate_bulk(struct usb_device *, void *); extern void usb_init_root_hub(struct usb_device *dev); +extern int usb_root_hub_string(int id, int serial, char *type, __u8 *data, int len); extern void usb_connect(struct usb_device *dev); extern void usb_disconnect(struct usb_device **); -- 2.39.5