[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emufx.c,1.41,1.42

2003-10-17 Thread Takashi Iwai
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv31170/pci/emu10k1

Modified Files:
emufx.c 
Log Message:
- take back the old definition of FXBUS_PCM_LEFT/RIGHT for sb live.
- fixed the audigy routing with the new definition.


Index: emufx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- emufx.c 13 Oct 2003 16:30:45 -  1.41
+++ emufx.c 17 Oct 2003 15:39:52 -  1.42
@@ -1269,8 +1269,8 @@
snd_emu10k1_ptr_write(emu, A_DBG, 0, (emu-fx8010.dbg = 0) | 
A_DBG_SINGLE_STEP);
 
/* PCM front Playback Volume (independent from stereo mix) */
-   A_OP(icode, ptr, iMAC0, A_GPR(playback), A_C_, A_GPR(gpr), 
A_FXBUS(FXBUS_PCM_LEFT));
-   A_OP(icode, ptr, iMAC0, A_GPR(playback+1), A_C_, A_GPR(gpr+1), 
A_FXBUS(FXBUS_PCM_RIGHT));
+   A_OP(icode, ptr, iMAC0, A_GPR(playback), A_C_, A_GPR(gpr), 
A_FXBUS(FXBUS_PCM_LEFT_FRONT));
+   A_OP(icode, ptr, iMAC0, A_GPR(playback+1), A_C_, A_GPR(gpr+1), 
A_FXBUS(FXBUS_PCM_RIGHT_FRONT));
snd_emu10k1_init_stereo_control(controls[nctl++], PCM Front Playback 
Volume, gpr, 100);
gpr += 2;

@@ -1294,8 +1294,8 @@
 * Stereo Mix
 */
/* Wave (PCM) Playback Volume (will be renamed later) */
-   A_OP(icode, ptr, iMAC0, A_GPR(stereo_mix), A_C_, A_GPR(gpr), 
A_FXBUS(FXBUS_WAVE_LEFT));
-   A_OP(icode, ptr, iMAC0, A_GPR(stereo_mix+1), A_C_, A_GPR(gpr+1), 
A_FXBUS(FXBUS_WAVE_RIGHT));
+   A_OP(icode, ptr, iMAC0, A_GPR(stereo_mix), A_C_, A_GPR(gpr), 
A_FXBUS(FXBUS_PCM_LEFT));
+   A_OP(icode, ptr, iMAC0, A_GPR(stereo_mix+1), A_C_, A_GPR(gpr+1), 
A_FXBUS(FXBUS_PCM_RIGHT));
snd_emu10k1_init_stereo_control(controls[nctl++], Wave Playback Volume, 
gpr, 100);
gpr += 2;
 



---
This SF.net email sponsored by: Enterprise Linux Forum Conference  Expo
The Event For Linux Datacenter Solutions  Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office;  in the Server Room 
http://www.enterpriselinuxforum.com
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver/support/pnp pnp.c,1.14,1.15

2003-10-17 Thread Takashi Iwai
Update of /cvsroot/alsa/alsa-driver/support/pnp
In directory sc8-pr-cvs1:/tmp/cvs-serv32166

Modified Files:
pnp.c 
Log Message:
more clean ups and potential bugfix.





Index: pnp.c
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pnp.c   16 Oct 2003 11:54:04 -  1.14
+++ pnp.c   17 Oct 2003 15:45:02 -  1.15
@@ -186,36 +186,37 @@
ninst-devs[i] = NULL;
for (i = 0; i  PNP_MAX_DEVICES  cid-devs[i].id[0] != '\0'; 
i++) {
if (parse_id(cid-devs[i].id, subvendor, subdevice) 
 0)
-   goto __next_card;
+   goto __next_id;
dev = ninst-devs[i] = (struct pnp_dev 
*)isapnp_find_dev((struct isapnp_card *)card, subvendor, subdevice, NULL);
if (dev == NULL)
-   break;
+   goto __next_card;
}
-   if (i == PNP_MAX_DEVICES || !cid-devs[i].id[0]) {
-   /* all parsed successfully */
-   /* activate or deactivate devices before probing */
-   for (i = 0; i  PNP_MAX_DEVICES; i++) {
-   dev = ninst-devs[i];
-   if (! dev)
-   break;
-   if ((drv-flags  PNP_DRIVER_RES_DISABLE) != 
PNP_DRIVER_RES_DISABLE)
-   dev-p.activate((struct isapnp_dev 
*)dev);
-   else {
-   dev-p.deactivate((struct isapnp_dev 
*)dev);
-   dev-p.prepare((struct isapnp_dev 
*)dev);
-   }
-   }
-   ninst-link.card = card;
-   ninst-link.driver = drv;
-   ninst-link.driver_data = NULL;
-   if (drv-probe(ninst-link, cid) = 0) {
-   list_add_tail(ninst-list, pnp_card_drivers);
-   ninst = NULL;
-   res++;
+
+   /* all parsed successfully */
+   /* activate or deactivate devices before probing */
+   for (i = 0; i  PNP_MAX_DEVICES; i++) {
+   dev = ninst-devs[i];
+   if (! dev)
+   break;
+   if (! drv-flags)
+   dev-p.activate((struct isapnp_dev *)dev);
+   else if (drv-flags != PNP_DRIVER_RES_DO_NOT_CHANGE) {
+   dev-p.deactivate((struct isapnp_dev *)dev);
+   dev-p.prepare((struct isapnp_dev *)dev);
}
}
+   ninst-link.card = card;
+   ninst-link.driver = drv;
+   ninst-link.driver_data = NULL;
+   if (drv-probe(ninst-link, cid) = 0) {
+   list_add_tail(ninst-list, pnp_card_drivers);
+   ninst = NULL;
+   res++;
+   }
+   __next_card:
+   ;
}
-   __next_card:
+   __next_id:
;
}
 



---
This SF.net email sponsored by: Enterprise Linux Forum Conference  Expo
The Event For Linux Datacenter Solutions  Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office;  in the Server Room 
http://www.enterpriselinuxforum.com
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver/acore timer.patch,1.1,1.2

2003-10-17 Thread Takashi Iwai
Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv31485/acore

Modified Files:
timer.patch 
Log Message:
fixed the compilation with suse 9.0 kernel (supporting variable HZ).



Index: timer.patch
===
RCS file: /cvsroot/alsa/alsa-driver/acore/timer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timer.patch 30 May 2003 13:37:41 -  1.1
+++ timer.patch 17 Oct 2003 15:41:19 -  1.2
@@ -1,5 +1,14 @@
 --- timer.c2003-05-30 15:33:01.0 +0200
 +++ timer.c.old2003-05-30 15:32:56.0 +0200
+@@ -969,7 +969,7 @@
+ static struct _snd_timer_hardware snd_timer_system =
+ {
+   .flags =SNDRV_TIMER_HW_FIRST | SNDRV_TIMER_HW_TASKLET,
+-  .resolution =   10L / HZ,
++  // .resolution =10L / HZ,
+   .ticks =1000L,
+   .start =snd_timer_s_start,
+   .stop = snd_timer_s_stop
 @@ -1733,7 +1733,9 @@
  
  static struct file_operations snd_timer_f_ops =
@@ -10,3 +19,11 @@
.read = snd_timer_user_read,
.open = snd_timer_user_open,
.release =  snd_timer_user_release,
+@@ -1779,6 +1781,7 @@
+   int err;
+   snd_info_entry_t *entry;
+ 
++  snd_timer_system.resolution = 10L / HZ;
+ #ifdef SNDRV_OSS_INFO_DEV_TIMERS
+   snd_oss_info_register(SNDRV_OSS_INFO_DEV_TIMERS, SNDRV_CARDS - 1, system 
timer);
+ #endif



---
This SF.net email sponsored by: Enterprise Linux Forum Conference  Expo
The Event For Linux Datacenter Solutions  Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office;  in the Server Room 
http://www.enterpriselinuxforum.com
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_direct.c,1.6,1.7

2003-10-17 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv5716

Modified Files:
pcm_direct.c 
Log Message:
Fixed problem with Xwindows (socket descriptors)

Index: pcm_direct.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_direct.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcm_direct.c2 Sep 2003 10:32:33 -   1.6
+++ pcm_direct.c17 Oct 2003 07:38:38 -  1.7
@@ -316,7 +316,7 @@
ret = fork();
if (ret == 0)
server_job(dmix);
-   exit(EXIT_SUCCESS);
+   _exit(EXIT_SUCCESS);
} else {
waitpid(ret, NULL, 0);
}



---
This SF.net email sponsored by: Enterprise Linux Forum Conference  Expo
The Event For Linux Datacenter Solutions  Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office;  in the Server Room 
http://www.enterpriselinuxforum.com
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog