aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-02-28 16:09:34 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-28 16:09:34 -0500
commit74bd7d093b8e87f35eaf3b14459b96a0e20d1d10 (patch)
tree24851d6588cf453d772e10a7b3ea7541cddb33ca /include
parent5f1ef5108a7a5e9fc220f73352eb7b428a2499d5 (diff)
[SPARC64]: Fix parport_pc build.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/dma.h4
-rw-r--r--include/asm-sparc64/parport.h22
2 files changed, 22 insertions, 4 deletions
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h
index 93e5a062df88..1bf4f7a8fbe1 100644
--- a/include/asm-sparc64/dma.h
+++ b/include/asm-sparc64/dma.h
@@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \
205#define for_each_dvma(dma) \ 205#define for_each_dvma(dma) \
206 for((dma) = dma_chain; (dma); (dma) = (dma)->next) 206 for((dma) = dma_chain; (dma); (dma) = (dma)->next)
207 207
208extern int get_dma_list(char *);
209extern int request_dma(unsigned int, __const__ char *);
210extern void free_dma(unsigned int);
211
212/* From PCI */ 208/* From PCI */
213 209
214#ifdef CONFIG_PCI 210#ifdef CONFIG_PCI
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index d3895873e4c7..be9509c8f8c1 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -23,8 +23,30 @@ static struct sparc_ebus_info {
23 struct ebus_dma_info info; 23 struct ebus_dma_info info;
24 unsigned int addr; 24 unsigned int addr;
25 unsigned int count; 25 unsigned int count;
26 int lock;
26} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS]; 27} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
27 28
29static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
30{
31 if (dmanr >= PARPORT_PC_MAX_PORTS)
32 return -EINVAL;
33 if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
34 return -EBUSY;
35 return 0;
36}
37
38static __inline__ void free_dma(unsigned int dmanr)
39{
40 if (dmanr >= PARPORT_PC_MAX_PORTS) {
41 printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
42 return;
43 }
44 if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
45 printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
46 return;
47 }
48}
49
28static __inline__ void enable_dma(unsigned int dmanr) 50static __inline__ void enable_dma(unsigned int dmanr)
29{ 51{
30 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1); 52 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);