git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
sound
/
oss
/
cs4281
/
cs4281m.c
diff --git
a/sound/oss/cs4281/cs4281m.c
b/sound/oss/cs4281/cs4281m.c
index
a6f09cc
..
5fff9c3
100644
(file)
--- a/
sound/oss/cs4281/cs4281m.c
+++ b/
sound/oss/cs4281/cs4281m.c
@@
-111,7
+111,7
@@
static void start_adc(struct cs4281_state *s);
// rather than 64k as some of the games work more responsively.
// log base 2( buff sz = 32k).
static unsigned long defaultorder = 3;
// rather than 64k as some of the games work more responsively.
// log base 2( buff sz = 32k).
static unsigned long defaultorder = 3;
-
MODULE_PARM(defaultorder, "i"
);
+
module_param(defaultorder, ulong, 0
);
//
// Turn on/off debugging compilation by commenting out "#define CSDEBUG"
//
// Turn on/off debugging compilation by commenting out "#define CSDEBUG"
@@
-159,8
+159,8
@@
MODULE_PARM(defaultorder, "i");
#if CSDEBUG
static unsigned long cs_debuglevel = 1; // levels range from 1-9
static unsigned long cs_debugmask = CS_INIT | CS_ERROR; // use CS_DBGOUT with various mask values
#if CSDEBUG
static unsigned long cs_debuglevel = 1; // levels range from 1-9
static unsigned long cs_debugmask = CS_INIT | CS_ERROR; // use CS_DBGOUT with various mask values
-
MODULE_PARM(cs_debuglevel, "i"
);
-
MODULE_PARM(cs_debugmask, "i"
);
+
module_param(cs_debuglevel, ulong, 0
);
+
module_param(cs_debugmask, ulong, 0
);
#endif
#define CS_TRUE 1
#define CS_FALSE 0
#endif
#define CS_TRUE 1
#define CS_FALSE 0
@@
-197,7
+197,7
@@
static const char invalid_magic[] =
})
//LIST_HEAD(cs4281_devs);
})
//LIST_HEAD(cs4281_devs);
-struct list_head cs4281_devs = { &cs4281_devs, &cs4281_devs };
+st
atic st
ruct list_head cs4281_devs = { &cs4281_devs, &cs4281_devs };
struct cs4281_state;
struct cs4281_state;
@@
-221,7
+221,8
@@
struct cs4281_state {
// hardware resources
unsigned int pBA0phys, pBA1phys;
// hardware resources
unsigned int pBA0phys, pBA1phys;
- char *pBA0, *pBA1;
+ char __iomem *pBA0;
+ char __iomem *pBA1;
unsigned int irq;
// mixer registers
unsigned int irq;
// mixer registers
@@
-1018,7
+1019,7
@@
static void printpipelines(struct cs4281_state *s)
* Suspend - save the ac97 regs, mute the outputs and power down the part.
*
****************************************************************************/
* Suspend - save the ac97 regs, mute the outputs and power down the part.
*
****************************************************************************/
-void cs4281_ac97_suspend(struct cs4281_state *s)
+
static
void cs4281_ac97_suspend(struct cs4281_state *s)
{
int Count,i;
{
int Count,i;
@@
-1069,7
+1070,7
@@
void cs4281_ac97_suspend(struct cs4281_state *s)
* Resume - power up the part and restore its registers..
*
****************************************************************************/
* Resume - power up the part and restore its registers..
*
****************************************************************************/
-void cs4281_ac97_resume(struct cs4281_state *s)
+
static
void cs4281_ac97_resume(struct cs4281_state *s)
{
int Count,i;
{
int Count,i;
@@
-1142,7
+1143,7
@@
HWAC97codec::SavePowerState(void)
} // SavePowerState
*/
} // SavePowerState
*/
-void cs4281_SuspendFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
+
static
void cs4281_SuspendFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
{
/*
* We need to save the contents of the BASIC FIFO Registers.
{
/*
* We need to save the contents of the BASIC FIFO Registers.
@@
-1150,7
+1151,7
@@
void cs4281_SuspendFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
pl->u32FCRn_Save = readl(s->pBA0 + pl->u32FCRnAddress);
pl->u32FSICn_Save = readl(s->pBA0 + pl->u32FSICnAddress);
}
pl->u32FCRn_Save = readl(s->pBA0 + pl->u32FCRnAddress);
pl->u32FSICn_Save = readl(s->pBA0 + pl->u32FSICnAddress);
}
-void cs4281_ResumeFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
+
static
void cs4281_ResumeFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
{
/*
* We need to restore the contents of the BASIC FIFO Registers.
{
/*
* We need to restore the contents of the BASIC FIFO Registers.
@@
-1158,7
+1159,7
@@
void cs4281_ResumeFIFO(struct cs4281_state *s, struct cs4281_pipeline *pl)
writel(pl->u32FCRn_Save,s->pBA0 + pl->u32FCRnAddress);
writel(pl->u32FSICn_Save,s->pBA0 + pl->u32FSICnAddress);
}
writel(pl->u32FCRn_Save,s->pBA0 + pl->u32FCRnAddress);
writel(pl->u32FSICn_Save,s->pBA0 + pl->u32FSICnAddress);
}
-void cs4281_SuspendDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
+
static
void cs4281_SuspendDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
{
//
// We need to save the contents of the BASIC DMA Registers.
{
//
// We need to save the contents of the BASIC DMA Registers.
@@
-1170,7
+1171,7
@@
void cs4281_SuspendDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
pl->u32DCCn_Save = readl(s->pBA0 + pl->u32DCCnAddress);
pl->u32DCAn_Save = readl(s->pBA0 + pl->u32DCAnAddress);
}
pl->u32DCCn_Save = readl(s->pBA0 + pl->u32DCCnAddress);
pl->u32DCAn_Save = readl(s->pBA0 + pl->u32DCAnAddress);
}
-void cs4281_ResumeDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
+
static
void cs4281_ResumeDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
{
//
// We need to save the contents of the BASIC DMA Registers.
{
//
// We need to save the contents of the BASIC DMA Registers.
@@
-1183,7
+1184,7
@@
void cs4281_ResumeDMAengine(struct cs4281_state *s, struct cs4281_pipeline *pl)
writel( pl->u32DCAn_Save, s->pBA0 + pl->u32DCAnAddress);
}
writel( pl->u32DCAn_Save, s->pBA0 + pl->u32DCAnAddress);
}
-int cs4281_suspend(struct cs4281_state *s)
+
static
int cs4281_suspend(struct cs4281_state *s)
{
int i;
u32 u32CLKCR1;
{
int i;
u32 u32CLKCR1;
@@
-1339,7
+1340,7
@@
int cs4281_suspend(struct cs4281_state *s)
return 0;
}
return 0;
}
-int cs4281_resume(struct cs4281_state *s)
+
static
int cs4281_resume(struct cs4281_state *s)
{
int i;
unsigned temp1;
{
int i;
unsigned temp1;
@@
-1694,7
+1695,7
@@
static void start_adc(struct cs4281_state *s)
#define DMABUF_MINORDER 1 // ==> min buffer size = 8K.
#define DMABUF_MINORDER 1 // ==> min buffer size = 8K.
-void dealloc_dmabuf(struct cs4281_state *s, struct dmabuf *db)
+
static
void dealloc_dmabuf(struct cs4281_state *s, struct dmabuf *db)
{
struct page *map, *mapend;
{
struct page *map, *mapend;
@@
-1755,7
+1756,7
@@
static int prog_dmabuf(struct cs4281_state *s, struct dmabuf *db)
}
db->buforder = order;
// Now mark the pages as reserved; otherwise the
}
db->buforder = order;
// Now mark the pages as reserved; otherwise the
- // remap_p
age
_range() in cs4281_mmap doesn't work.
+ // remap_p
fn
_range() in cs4281_mmap doesn't work.
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(db->rawbuf +
(PAGE_SIZE << db->buforder) - 1);
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(db->rawbuf +
(PAGE_SIZE << db->buforder) - 1);
@@
-1778,7
+1779,7
@@
static int prog_dmabuf(struct cs4281_state *s, struct dmabuf *db)
}
s->buforder_tmpbuff = order;
// Now mark the pages as reserved; otherwise the
}
s->buforder_tmpbuff = order;
// Now mark the pages as reserved; otherwise the
- // remap_p
age
_range() in cs4281_mmap doesn't work.
+ // remap_p
fn
_range() in cs4281_mmap doesn't work.
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(s->tmpbuff +
(PAGE_SIZE << s->buforder_tmpbuff) - 1);
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(s->tmpbuff +
(PAGE_SIZE << s->buforder_tmpbuff) - 1);
@@
-3135,9
+3136,10
@@
static int cs4281_mmap(struct file *file, struct vm_area_struct *vma)
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << db->buforder))
return -EINVAL;
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << db->buforder))
return -EINVAL;
- if (remap_page_range
- (vma, vma->vm_start, virt_to_phys(db->rawbuf), size,
- vma->vm_page_prot)) return -EAGAIN;
+ if (remap_pfn_range(vma, vma->vm_start,
+ virt_to_phys(db->rawbuf) >> PAGE_SHIFT,
+ size, vma->vm_page_prot))
+ return -EAGAIN;
db->mapped = 1;
CS_DBGOUT(CS_FUNCTION | CS_PARMS | CS_OPEN, 4,
db->mapped = 1;
CS_DBGOUT(CS_FUNCTION | CS_PARMS | CS_OPEN, 4,
@@
-4110,7
+4112,7
@@
static struct initvol {
#ifndef NOT_CS4281_PM
#ifndef NOT_CS4281_PM
-void __devinit cs4281_BuildFIFO(
+
static
void __devinit cs4281_BuildFIFO(
struct cs4281_pipeline *p,
struct cs4281_state *s)
{
struct cs4281_pipeline *p,
struct cs4281_state *s)
{
@@
-4157,7
+4159,7
@@
void __devinit cs4281_BuildFIFO(
}
}
-void __devinit cs4281_BuildDMAengine(
+
static
void __devinit cs4281_BuildDMAengine(
struct cs4281_pipeline *p,
struct cs4281_state *s)
{
struct cs4281_pipeline *p,
struct cs4281_state *s)
{
@@
-4227,7
+4229,7
@@
void __devinit cs4281_BuildDMAengine(
}
}
-void __devinit cs4281_InitPM(struct cs4281_state *s)
+
static
void __devinit cs4281_InitPM(struct cs4281_state *s)
{
int i;
struct cs4281_pipeline *p;
{
int i;
struct cs4281_pipeline *p;
@@
-4457,7
+4459,7
@@
static struct pci_device_id cs4281_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, cs4281_pci_tbl);
MODULE_DEVICE_TABLE(pci, cs4281_pci_tbl);
-struct pci_driver cs4281_pci_driver = {
+st
atic st
ruct pci_driver cs4281_pci_driver = {
.name = "cs4281",
.id_table = cs4281_pci_tbl,
.probe = cs4281_probe,
.name = "cs4281",
.id_table = cs4281_pci_tbl,
.probe = cs4281_probe,
@@
-4466,7
+4468,7
@@
struct pci_driver cs4281_pci_driver = {
.resume = CS4281_RESUME_TBL,
};
.resume = CS4281_RESUME_TBL,
};
-int __init cs4281_init_module(void)
+
static
int __init cs4281_init_module(void)
{
int rtn = 0;
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
{
int rtn = 0;
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
@@
-4481,7
+4483,7
@@
int __init cs4281_init_module(void)
return rtn;
}
return rtn;
}
-void __exit cs4281_cleanup_module(void)
+
static
void __exit cs4281_cleanup_module(void)
{
pci_unregister_driver(&cs4281_pci_driver);
#ifndef NOT_CS4281_PM
{
pci_unregister_driver(&cs4281_pci_driver);
#ifndef NOT_CS4281_PM
@@
-4501,9
+4503,3
@@
MODULE_LICENSE("GPL");
module_init(cs4281_init_module);
module_exit(cs4281_cleanup_module);
module_init(cs4281_init_module);
module_exit(cs4281_cleanup_module);
-#ifndef MODULE
-int __init init_cs4281(void)
-{
- return cs4281_init_module();
-}
-#endif