Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv28241/alsa-kernel/core
Modified Files:
control.c hwdep.c pcm_native.c rawmidi.c sound.c
Log Message:
- sync with the 2.6 tree (imajor, iminor)
- fixed firmware ioctls for sscape and hdsp drivers (ioctl out of range)
Index: control.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- control.c 11 Jun 2003 22:56:45 -0000 1.36
+++ control.c 25 Sep 2003 18:55:42 -0000 1.37
@@ -42,7 +42,7 @@
static int snd_ctl_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_CARD(iminor(inode));
unsigned long flags;
snd_card_t *card;
snd_ctl_file_t *ctl;
Index: hwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hwdep.c 4 Sep 2003 18:45:26 -0000 1.20
+++ hwdep.c 25 Sep 2003 18:55:42 -0000 1.21
@@ -73,7 +73,7 @@
static int snd_hwdep_open(struct inode *inode, struct file * file)
{
- int major = major(inode->i_rdev);
+ int major = imajor(inode);
int cardnum;
int device;
snd_hwdep_t *hw;
@@ -82,12 +82,12 @@
switch (major) {
case CONFIG_SND_MAJOR:
- cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
- device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_HWDEP;
+ cardnum = SNDRV_MINOR_CARD(iminor(inode));
+ device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_HWDEP;
break;
#ifdef CONFIG_SND_OSSEMUL
case SOUND_MAJOR:
- cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
device = 0;
break;
#endif
Index: pcm_native.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pcm_native.c 3 Sep 2003 13:43:40 -0000 1.80
+++ pcm_native.c 25 Sep 2003 18:55:42 -0000 1.81
@@ -1430,11 +1430,11 @@
return 0;
inode = file->f_dentry->d_inode;
if (!S_ISCHR(inode->i_mode) ||
- major(inode->i_rdev) != snd_major) {
+ imajor(inode) != snd_major) {
fput(file);
return 0;
}
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor >= 256 ||
minor % SNDRV_MINOR_DEVICES < SNDRV_MINOR_PCM_PLAYBACK) {
fput(file);
@@ -1939,8 +1939,8 @@
int snd_pcm_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
- int device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_CARD(iminor(inode));
+ int device = SNDRV_MINOR_DEVICE(iminor(inode));
int err;
snd_pcm_t *pcm;
snd_pcm_file_t *pcm_file;
Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rawmidi.c 21 Jul 2003 16:59:06 -0000 1.36
+++ rawmidi.c 25 Sep 2003 18:55:42 -0000 1.37
@@ -345,7 +345,7 @@
static int snd_rawmidi_open(struct inode *inode, struct file *file)
{
- int maj = major(inode->i_rdev);
+ int maj = imajor(inode);
int cardnum;
snd_card_t *card;
int device, subdevice;
@@ -359,16 +359,16 @@
switch (maj) {
case CONFIG_SND_MAJOR:
- cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_CARD(iminor(inode));
cardnum %= SNDRV_CARDS;
- device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) -
SNDRV_MINOR_RAWMIDI;
+ device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_RAWMIDI;
device %= SNDRV_MINOR_RAWMIDIS;
break;
#ifdef CONFIG_SND_OSSEMUL
case SOUND_MAJOR:
- cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
cardnum %= SNDRV_CARDS;
- device = SNDRV_MINOR_OSS_DEVICE(minor(inode->i_rdev)) ==
SNDRV_MINOR_OSS_MIDI ?
+ device = SNDRV_MINOR_OSS_DEVICE(iminor(inode)) == SNDRV_MINOR_OSS_MIDI
?
midi_map[cardnum] : amidi_map[cardnum];
break;
#endif
Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sound.c 3 Sep 2003 13:43:41 -0000 1.48
+++ sound.c 25 Sep 2003 18:55:42 -0000 1.49
@@ -116,7 +116,7 @@
static int snd_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int card = SNDRV_MINOR_CARD(minor);
int dev = SNDRV_MINOR_DEVICE(minor);
snd_minor_t *mptr = NULL;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
