Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SPARC64]: Fix parport_pc build.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-02-28 13:09:34 -08:00
parent 5f1ef5108a
commit 74bd7d093b
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm-sparc64/dma.h
View File

@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \
#define for_each_dvma(dma) \ #define for_each_dvma(dma) \
for((dma) = dma_chain; (dma); (dma) = (dma)->next) for((dma) = dma_chain; (dma); (dma) = (dma)->next)
extern int get_dma_list(char *);
extern int request_dma(unsigned int, __const__ char *);
extern void free_dma(unsigned int);
/* From PCI */ /* From PCI */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI

22
include/asm-sparc64/parport.h
View File

@ -23,8 +23,30 @@ static struct sparc_ebus_info {
struct ebus_dma_info info; struct ebus_dma_info info;
unsigned int addr; unsigned int addr;
unsigned int count; unsigned int count;
int lock;
} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS]; } sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
{
if (dmanr >= PARPORT_PC_MAX_PORTS)
return -EINVAL;
if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
return -EBUSY;
return 0;
}
static __inline__ void free_dma(unsigned int dmanr)
{
if (dmanr >= PARPORT_PC_MAX_PORTS) {
printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
return;
}
if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
return;
}
}
static __inline__ void enable_dma(unsigned int dmanr) static __inline__ void enable_dma(unsigned int dmanr)
{ {
ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1); ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);