Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
9fc20f03
Commit
9fc20f03
authored
May 14, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALSA: ctxfi - Move PCI ID definitions to linux/pci_ids.h
Signed-off-by:
Takashi Iwai
<
tiwai@suse.de
>
parent
d0da727e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
41 deletions
+19
-41
include/linux/pci_ids.h
include/linux/pci_ids.h
+7
-0
sound/pci/ctxfi/ctatc.c
sound/pci/ctxfi/ctatc.c
+9
-8
sound/pci/ctxfi/ctdrv.h
sound/pci/ctxfi/ctdrv.h
+0
-30
sound/pci/ctxfi/xfi.c
sound/pci/ctxfi/xfi.c
+3
-3
No files found.
include/linux/pci_ids.h
View file @
9fc20f03
...
...
@@ -1314,6 +1314,13 @@
#define PCI_VENDOR_ID_CREATIVE 0x1102
/* duplicate: ECTIVA */
#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
#define PCI_DEVICE_ID_CREATIVE_20K1 0x0005
#define PCI_DEVICE_ID_CREATIVE_20K2 0x000b
#define PCI_SUBDEVICE_ID_CREATIVE_SB0760 0x0024
#define PCI_SUBDEVICE_ID_CREATIVE_SB08801 0x0041
#define PCI_SUBDEVICE_ID_CREATIVE_SB08802 0x0042
#define PCI_SUBDEVICE_ID_CREATIVE_SB08803 0x0043
#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX 0x6000
#define PCI_VENDOR_ID_ECTIVA 0x1102
/* duplicate: CREATIVE */
#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938
...
...
sound/pci/ctxfi/ctatc.c
View file @
9fc20f03
...
...
@@ -18,7 +18,6 @@
#include "ctatc.h"
#include "ctpcm.h"
#include "ctmixer.h"
#include "ctdrv.h"
#include "cthardware.h"
#include "ctsrc.h"
#include "ctamixer.h"
...
...
@@ -40,23 +39,25 @@
| ((IEC958_AES3_CON_FS_48000) << 24))
static
const
struct
ct_atc_chip_sub_details
atc_sub_details
[
NUM_CTCARDS
]
=
{
[
CTSB0760
]
=
{.
subsys
=
PCI_SUB
SYS
_CREATIVE_SB0760
,
[
CTSB0760
]
=
{.
subsys
=
PCI_SUB
DEVICE_ID
_CREATIVE_SB0760
,
.
nm_model
=
"SB076x"
},
[
CTHENDRIX
]
=
{.
subsys
=
PCI_SUB
SYS
_CREATIVE_HENDRIX
,
[
CTHENDRIX
]
=
{.
subsys
=
PCI_SUB
DEVICE_ID
_CREATIVE_HENDRIX
,
.
nm_model
=
"Hendrix"
},
[
CTSB08801
]
=
{.
subsys
=
PCI_SUB
SYS
_CREATIVE_SB08801
,
[
CTSB08801
]
=
{.
subsys
=
PCI_SUB
DEVICE_ID
_CREATIVE_SB08801
,
.
nm_model
=
"SB0880"
},
[
CTSB08802
]
=
{.
subsys
=
PCI_SUB
SYS
_CREATIVE_SB08802
,
[
CTSB08802
]
=
{.
subsys
=
PCI_SUB
DEVICE_ID
_CREATIVE_SB08802
,
.
nm_model
=
"SB0880"
},
[
CTSB08803
]
=
{.
subsys
=
PCI_SUB
SYS
_CREATIVE_SB08803
,
[
CTSB08803
]
=
{.
subsys
=
PCI_SUB
DEVICE_ID
_CREATIVE_SB08803
,
.
nm_model
=
"SB0880"
}
};
static
struct
ct_atc_chip_details
atc_chip_details
[]
=
{
{.
vendor
=
PCI_VENDOR_CREATIVE
,
.
device
=
PCI_DEVICE_CREATIVE_20K1
,
{.
vendor
=
PCI_VENDOR_ID_CREATIVE
,
.
device
=
PCI_DEVICE_ID_CREATIVE_20K1
,
.
sub_details
=
NULL
,
.
nm_card
=
"X-Fi 20k1"
},
{.
vendor
=
PCI_VENDOR_CREATIVE
,
.
device
=
PCI_DEVICE_CREATIVE_20K2
,
{.
vendor
=
PCI_VENDOR_ID_CREATIVE
,
.
device
=
PCI_DEVICE_ID_CREATIVE_20K2
,
.
sub_details
=
atc_sub_details
,
.
nm_card
=
"X-Fi 20k2"
},
{}
/* terminator */
...
...
sound/pci/ctxfi/ctdrv.h
deleted
100644 → 0
View file @
d0da727e
/**
* Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.
*
* This source file is released under GPL v2 license (no other versions).
* See the COPYING file included in the main directory of this source
* distribution for the license terms and conditions.
*
* @file ctdrv.h
*
* @breaf
* This file contains the definition of card IDs supported by this driver.
*
* @author Liu Chun
*
*/
#ifndef CTDRV_H
#define CTDRV_H
#define PCI_VENDOR_CREATIVE 0x1102
#define PCI_DEVICE_CREATIVE_20K1 0x0005
#define PCI_DEVICE_CREATIVE_20K2 0x000B
#define PCI_SUBVENDOR_CREATIVE 0x1102
#define PCI_SUBSYS_CREATIVE_SB0760 0x0024
#define PCI_SUBSYS_CREATIVE_SB08801 0x0041
#define PCI_SUBSYS_CREATIVE_SB08802 0x0042
#define PCI_SUBSYS_CREATIVE_SB08803 0x0043
#define PCI_SUBSYS_CREATIVE_HENDRIX 0x6000
#endif
/* CTDRV_H */
sound/pci/ctxfi/xfi.c
View file @
9fc20f03
...
...
@@ -11,10 +11,10 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/moduleparam.h>
#include <linux/pci_ids.h>
#include <sound/core.h>
#include <sound/initval.h>
#include "ctatc.h"
#include "ctdrv.h"
MODULE_AUTHOR
(
"Creative Technology Ltd"
);
MODULE_DESCRIPTION
(
"X-Fi driver version 1.03"
);
...
...
@@ -32,8 +32,8 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
static
struct
pci_device_id
ct_pci_dev_ids
[]
=
{
/* only X-Fi is supported, so... */
{
PCI_DEVICE
(
PCI_VENDOR_
CREATIVE
,
PCI_DEVICE
_CREATIVE_20K1
)
},
{
PCI_DEVICE
(
PCI_VENDOR_
CREATIVE
,
PCI_DEVICE
_CREATIVE_20K2
)
},
{
PCI_DEVICE
(
PCI_VENDOR_
ID_CREATIVE
,
PCI_DEVICE_ID
_CREATIVE_20K1
)
},
{
PCI_DEVICE
(
PCI_VENDOR_
ID_CREATIVE
,
PCI_DEVICE_ID
_CREATIVE_20K2
)
},
{
0
,
}
};
MODULE_DEVICE_TABLE
(
pci
,
ct_pci_dev_ids
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment