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

Commit 92de3831 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

mac_scsi: Remove header 



The #defines in mac_scsi.h are intended to influence subsequent #includes in
mac_scsi.c. IMHO, that's too convoluted.

Remove mac_scsi.h by moving those macro definitions to mac_scsi.c,
consistent with other NCR5380 drivers.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent fd9cd67c

drivers/scsi/mac_scsi.c

+20 −1
Original line number Diff line number Diff line
@@ -31,10 +31,29 @@ 
#include <asm/mac_via.h>



#include <scsi/scsi_host.h>

#include "mac_scsi.h"



/* Definitions for the core NCR5380 driver. */



#define PSEUDO_DMA



#define NCR5380_implementation_fields   /* none */

#define NCR5380_local_declare()         struct Scsi_Host *_instance

#define NCR5380_setup(instance)         _instance = instance



#define NCR5380_read(reg)               macscsi_read(_instance, reg)

#define NCR5380_write(reg, value)       macscsi_write(_instance, reg, value)



#define NCR5380_pread                   macscsi_pread

#define NCR5380_pwrite                  macscsi_pwrite



#define NCR5380_intr                    macscsi_intr

#define NCR5380_queue_command           macscsi_queue_command

#define NCR5380_abort                   macscsi_abort

#define NCR5380_bus_reset               macscsi_bus_reset

#define NCR5380_info                    macscsi_info

#define NCR5380_show_info               macscsi_show_info

#define NCR5380_write_info              macscsi_write_info



#include "NCR5380.h"



#define RESET_BOOT

drivers/scsi/mac_scsi.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Cumana Generic NCR5380 driver defines

 *

 * Copyright 1993, Drew Eckhardt

 *	Visionary Computing

 *	(Unix and Linux consulting and custom programming)

 *	drew@colorado.edu

 *      +1 (303) 440-4894

 */



#ifndef MAC_NCR5380_H

#define MAC_NCR5380_H



#ifndef ASM



#include <scsi/scsicam.h>



#define NCR5380_implementation_fields /* none */



#define NCR5380_local_declare() \

        struct Scsi_Host *_instance



#define NCR5380_setup(instance) \

        _instance = instance



#define NCR5380_read(reg) macscsi_read(_instance, reg)

#define NCR5380_write(reg, value) macscsi_write(_instance, reg, value)



#define NCR5380_pread 	macscsi_pread

#define NCR5380_pwrite 	macscsi_pwrite

	

#define NCR5380_intr macscsi_intr

#define NCR5380_queue_command macscsi_queue_command

#define NCR5380_abort macscsi_abort

#define NCR5380_bus_reset macscsi_bus_reset

#define NCR5380_info macscsi_info

#define NCR5380_show_info macscsi_show_info

#define NCR5380_write_info macscsi_write_info



#endif /* ndef ASM */

#endif /* MAC_NCR5380_H */