mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: splice: direct splicing updates ppos twice more ACSI removal umem: Fix match of pci_ids in umem driver umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable remove the documentation for the legacy CDROM drivers
This commit is contained in:
commit
14dc524972
27 changed files with 9 additions and 5517 deletions
|
|
@ -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 */
|
||||
|
|
@ -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 */
|
||||
Loading…
Reference in a new issue