more ACSI removal

PATCH In review Adrian Bunk 3 participants 7 messages Jul 12, 2007 – Jul 16, 2007

Subsystems (4)

Networking Network drivers Documentation Block layer

lore

Share & tools

lore

Adrian Bunk

author

2007-07-12 23:45 UTC #0 lore raw

PATCH 1/1 more ACSI removal

This patch removes some code that became dead code after the ATARI_ACSI removal.

It also indirectly fixes the following bug introduced by commit c2bcf3b8978c291e1b7f6499475c8403a259d4d6:

config ATARI_SLM
tristate "Atari SLM laser printer support"
- depends on ATARI && ATARI_ACSI!=n
+ depends on ATARI

Signed-off-by Adrian Bunk <[email protected]>

---

 Documentation/m68k/kernel-options.txt    |    7 
 Documentation/networking/net-modules.txt |    6 
 drivers/block/Kconfig                    |   11 
 drivers/block/Makefile                   |    1 
 drivers/block/acsi_slm.c                 | 1032 -----------------------
 drivers/net/Kconfig                      |   16 
 drivers/net/Makefile                     |    2 
 drivers/net/Space.c                      |    8 
 drivers/net/atari_bionet.c               |  675 ---------------
 drivers/net/atari_pamsnet.c              |  878 -------------------
 include/asm-m68k/atari_SLM.h             |   28 
 include/asm-m68k/atari_acsi.h            |   37 
 12 files changed, 2701 deletions(-)

Documentation/networking/net-modules.txt renamed from Documentation/networking/net-modules.txt.old +0 -6

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

Documentation/m68k/kernel-options.txt renamed from Documentation/m68k/kernel-options.txt.old +0 -7

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

drivers/block/Kconfig renamed from drivers/block/Kconfig.old +0 ~~-11~~

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

drivers/block/Makefile renamed from drivers/block/Makefile.old +0 -1

@@ -10,6 +10,5 @@
 obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o
 obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
-obj-$(CONFIG_ATARI_SLM)		+= acsi_slm.o
 obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
 obj-$(CONFIG_BLK_DEV_RAM)	+= rd.o
 obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

drivers/net/Kconfig renamed from drivers/net/Kconfig.old +0 ~~-16~~

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

drivers/net/Makefile renamed from drivers/net/Makefile.old +0 -2

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

drivers/net/Space.c renamed from drivers/net/Space.c.old +0 -8

@@ -75,8 +75,6 @@
 extern struct net_device *sun3lance_probe(int unit);
 extern struct net_device *sun3_82586_probe(int unit);
 extern struct net_device *apne_probe(int unit);
-extern struct net_device *bionet_probe(int unit);
-extern struct net_device *pamsnet_probe(int unit);
 extern struct net_device *cs89x0_probe(int unit);
 extern struct net_device *hplance_probe(int unit);
 extern struct net_device *bagetlance_probe(int unit);

@@ -264,12 +262,6 @@
 #ifdef CONFIG_APNE		/* A1200 PCMCIA NE2000 */
 	{apne_probe, 0},
 #endif
-#ifdef CONFIG_ATARI_BIONET	/* Atari Bionet Ethernet board */
-	{bionet_probe, 0},
-#endif
-#ifdef CONFIG_ATARI_PAMSNET	/* Atari PAMsNet Ethernet board */
-	{pamsnet_probe, 0},
-#endif
 #ifdef CONFIG_MVME147_NET	/* MVME147 internal Ethernet */
 	{mvme147lance_probe, 0},
 #endif

include/asm-m68k/atari_acsi.h deleted +0 ~~-37~~

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

include/asm-m68k/atari_SLM.h deleted +0 ~~-28~~

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

drivers/block/acsi_slm.c deleted +0 ~~-1032~~

1,032 lines not on this page · raw message

drivers/net/atari_bionet.c deleted +0 ~~-675~~

675 lines not on this page · raw message

drivers/net/atari_pamsnet.c deleted +0 ~~-878~~

878 lines not on this page · raw message

Jens Axboe

2007-07-13 05:43 UTC #1 lore raw

Quoted 12 lines · Adrian Bunk

This patch removes some code that became dead code after the ATARI_ACSI removal.
It also indirectly fixes the following bug introduced by commit c2bcf3b8978c291e1b7f6499475c8403a259d4d6:
config ATARI_SLM
tristate "Atari SLM laser printer support"
(quoted diff) +1 -1
-       depends on ATARI && ATARI_ACSI!=n
+       depends on ATARI

Quoted 1 line

Signed-off-by Adrian Bunk <[email protected]>

Thanks Adrian, applied!

Signature · 1 line

Jens Axboe

Geert Uytterhoeven

2007-07-13 07:10 UTC #2 lore raw

In reply to Adrian Bunk

Quoted 2 lines · Adrian Bunk

This patch removes some code that became dead code after the ATARI_ACSI removal.

When was it removed? Nobody seems to have informed the m68k people...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Adrian Bunk

author

2007-07-15 09:29 UTC #3 lore raw

Quoted 6 lines · Geert Uytterhoeven

Quoted 2 lines · Adrian Bunk
This patch removes some code that became dead code after the ATARI_ACSI removal.
When was it removed?
...

Jens removed it in commit c2bcf3b8978c291e1b7f6499475c8403a259d4d6

Quoted 3 lines

Gr{oetje,eeting}s,
Geert

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Jens Axboe

2007-07-16 12:16 UTC #4 lore raw

In reply to Geert Uytterhoeven

Quoted 5 lines · Geert Uytterhoeven

Quoted 2 lines · Adrian Bunk
This patch removes some code that became dead code after the ATARI_ACSI removal.
When was it removed? Nobody seems to have informed the m68k people...

It hasn't even been compiling for 5 years, so it can't be that big of an issue. I thought you had been cc'ed on the discussion, but I can't seem to find the thread now even.

Signature · 1 line

Jens Axboe

Geert Uytterhoeven

Acked-by

2007-07-16 13:01 UTC #5 lore raw

Quoted 10 lines · Jens Axboe

Quoted 5 lines · Geert Uytterhoeven
Quoted 2 lines · Adrian Bunk
This patch removes some code that became dead code after the ATARI_ACSI removal.
When was it removed? Nobody seems to have informed the m68k people...
It hasn't even been compiling for 5 years, so it can't be that big of an issue. I thought you had been cc'ed on the discussion, but I can't seem to find the thread now even.

OK, in that case it doens't make much sense to keep ATARI_SLM, ATARI_BIONET, and ATARI_PAMSNET. Those who desperately(?) need it can resurvive ACSI if they want to...

Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Jens Axboe

2007-07-16 13:02 UTC #6 lore raw

Quoted 12 lines · Geert Uytterhoeven

Quoted 10 lines · Jens Axboe
Quoted 5 lines · Geert Uytterhoeven
Quoted 2 lines · Adrian Bunk
This patch removes some code that became dead code after the ATARI_ACSI removal.
When was it removed? Nobody seems to have informed the m68k people...
It hasn't even been compiling for 5 years, so it can't be that big of an issue. I thought you had been cc'ed on the discussion, but I can't seem to find the thread now even.

Quoted 5 lines

OK, in that case it doens't make much sense to keep ATARI_SLM, ATARI_BIONET, and ATARI_PAMSNET. Those who desperately(?) need it can resurvive ACSI if they want to...
Acked-by Geert Uytterhoeven <[email protected]>

Great thanks! I have that queued up, will add your acked-by.

Signature · 1 line

Jens Axboe