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

Commit 4e705205 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

atari_scsi: Remove header 



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

Remove atari_scsi.h by moving those macro definitions to atari_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>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3ff228af

drivers/scsi/atari_scsi.c

+26 −9
Original line number Diff line number Diff line
@@ -64,15 +64,7 @@ 
/**************************************************************************/







#include <linux/module.h>



/* For the Atari version, use only polled IO or REAL_DMA */

#define	REAL_DMA

/* Support tagged queuing? (on devices that are able to... :-) */

#define	SUPPORT_TAGS

#define	MAX_TAGS 32



#include <linux/types.h>

#include <linux/delay.h>

#include <linux/blkdev.h>
@@ -92,9 +84,34 @@ 


#include <scsi/scsi_host.h>



#include "atari_scsi.h"

/* Definitions for the core NCR5380 driver. */



#define REAL_DMA

#define SUPPORT_TAGS

#define MAX_TAGS                        32



#define NCR5380_implementation_fields   /* none */



#define NCR5380_read(reg)               atari_scsi_reg_read(reg)

#define NCR5380_write(reg, value)       atari_scsi_reg_write(reg, value)



#define NCR5380_queue_command           atari_scsi_queue_command

#define NCR5380_abort                   atari_scsi_abort

#define NCR5380_show_info               atari_scsi_show_info

#define NCR5380_info                    atari_scsi_info



#define NCR5380_dma_read_setup(instance, data, count) \

        atari_scsi_dma_setup(instance, data, count, 0)

#define NCR5380_dma_write_setup(instance, data, count) \

        atari_scsi_dma_setup(instance, data, count, 1)

#define NCR5380_dma_residual(instance) \

        atari_scsi_dma_residual(instance)

#define NCR5380_dma_xfer_len(instance, cmd, phase) \

        atari_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO))



#include "NCR5380.h"





#define	IS_A_TT()	ATARIHW_PRESENT(TT_SCSI)



#define	SCSI_DMA_WRITE_P(elt,val)				\

drivers/scsi/atari_scsi.h

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

 * atari_scsi.h -- Header file for the Atari native SCSI driver

 *

 * Copyright 1994 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>

 *

 * (Loosely based on the work of Robert De Vries' team)

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 *

 */





#ifndef ATARI_SCSI_H

#define ATARI_SCSI_H



/* (I_HAVE_OVERRUNS stuff removed) */



#ifndef ASM



#define	NCR5380_implementation_fields	/* none */



#define NCR5380_read(reg)		  atari_scsi_reg_read( reg )

#define NCR5380_write(reg, value) atari_scsi_reg_write( reg, value )



#define NCR5380_queue_command atari_scsi_queue_command

#define NCR5380_abort atari_scsi_abort

#define NCR5380_show_info atari_scsi_show_info

#define NCR5380_info atari_scsi_info

#define NCR5380_dma_read_setup(inst,d,c) atari_scsi_dma_setup (inst, d, c, 0)

#define NCR5380_dma_write_setup(inst,d,c) atari_scsi_dma_setup (inst, d, c, 1)

#define NCR5380_dma_residual(inst) atari_scsi_dma_residual( inst )

#define	NCR5380_dma_xfer_len(i,cmd,phase) \

	atari_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1)



#endif /* ndef ASM */

#endif /* ATARI_SCSI_H */