Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c39e7eee authored by Sam Creasey's avatar Sam Creasey Committed by Linus Torvalds
Browse files

[PATCH] Sun3 SCSI: Make sun3 scsi drivers compile/work again 



Make sun3 scsi drivers compile/work again (though with way too many warnings...)

Tested on 3/50, 3/60.

Signed-off-by: default avatarSam Creasey <sammy@sammy.net>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a3a79bd7

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ config SCSI_NCR53C7xx_FAST 


config SUN3_SCSI

	tristate "Sun3 NCR5380 SCSI"

	depends on SUN3 && SCSI && BROKEN

	depends on SUN3 && SCSI

	select SCSI_SPI_ATTRS

	help

	  This option will enable support for the OBIO (onboard io) NCR5380

drivers/scsi/sun3_NCR5380.c

+2 −2
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id) 
	NCR_PRINT(NDEBUG_INTR);

	if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {

	    done = 0;

	    ENABLE_IRQ();

//	    ENABLE_IRQ();

	    INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);

	    NCR5380_reselect(instance);

	    (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
@@ -1304,7 +1304,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id) 
		INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);

		NCR5380_dma_complete( instance );

		done = 0;

		ENABLE_IRQ();

//		ENABLE_IRQ();

	    } else

#endif /* REAL_DMA */

	    {

drivers/scsi/sun3_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ 
#define REAL_DMA



#include "scsi.h"

#include "initio.h"

#include <scsi/scsi_host.h>

#include "sun3_scsi.h"

#include "NCR5380.h"



static void NCR5380_print(struct Scsi_Host *instance);

drivers/scsi/sun3_scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct sun3_udc_regs { 
 *

 */





#include "NCR5380.h"



#if NDEBUG & NDEBUG_ARBITRATION

#define ARB_PRINTK(format, args...) \

drivers/scsi/sun3_scsi_vme.c

+1 −1
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
#define REAL_DMA



#include "scsi.h"

#include "initio.h"

#include <scsi/scsi_host.h>

#include "sun3_scsi.h"

#include "NCR5380.h"



extern int sun3_map_test(unsigned long, char *);