Update of /cvsroot/alsa/alsa-driver/usb/usx2y In directory sc8-pr-cvs1:/tmp/cvs-serv13043
Modified Files: usbusx2y.c usbusx2y.h usbusx2yaudio.c Log Message: - replaced the obsolete urb_t with struct urb. Index: usbusx2y.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2y.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- usbusx2y.c 27 Nov 2003 14:57:51 -0000 1.3 +++ usbusx2y.c 2 Dec 2003 10:15:02 -0000 1.4 @@ -115,9 +115,9 @@ * pipe 4 is used for switching the lamps, setting samplerate, volumes .... */ #ifndef OLD_USB -void snd_usX2Y_Out04Int(urb_t* urb, struct pt_regs *regs) +void snd_usX2Y_Out04Int(struct urb* urb, struct pt_regs *regs) #else -void snd_usX2Y_Out04Int(urb_t* urb) +void snd_usX2Y_Out04Int(struct urb* urb) #endif { if (urb->status) { @@ -130,9 +130,9 @@ #endif #ifndef OLD_USB -void snd_usX2Y_In04Int(urb_t* urb, struct pt_regs *regs) +void snd_usX2Y_In04Int(struct urb* urb, struct pt_regs *regs) #else -void snd_usX2Y_In04Int(urb_t* urb) +void snd_usX2Y_In04Int(struct urb* urb) #endif { int err = 0; Index: usbusx2y.h =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2y.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- usbusx2y.h 25 Nov 2003 11:21:49 -0000 1.1 +++ usbusx2y.h 2 Dec 2003 10:15:02 -0000 1.2 @@ -7,29 +7,24 @@ #define NRURBS 2 /* */ #define NRPACKS 1 /* usb-frames/ms per urb */ -#ifndef LINUX_2_2 -typedef struct urb urb_t; -typedef struct urb* purb_t; -#endif - #define URBS_AsyncSeq 10 #define URB_DataLen_AsyncSeq 32 typedef struct { - urb_t* urb[URBS_AsyncSeq]; + struct urb* urb[URBS_AsyncSeq]; char* buffer; } snd_usX2Y_AsyncSeq_t; typedef struct { int submitted; int len; - urb_t* urb[0]; + struct urb* urb[0]; } snd_usX2Y_urbSeq_t; typedef struct { snd_usb_audio_t chip; int stride; - purb_t In04urb; + struct urb* In04urb; void* In04Buf; char In04Last[24]; unsigned In04IntCalls; @@ -41,7 +36,7 @@ unsigned int rate, format; int refframes; - purb_t play_urb_waiting[2]; + struct urb* play_urb_waiting[2]; int pipe0Aframes[NRURBS][NRPACKS]; snd_hwdep_t* hwdep; int chip_status; @@ -56,11 +51,11 @@ int snd_usX2Y_audio_create(snd_card_t* card); #ifndef OLD_USB -void snd_usX2Y_Out04Int(urb_t* urb, struct pt_regs *regs); -void snd_usX2Y_In04Int(urb_t* urb, struct pt_regs *regs); +void snd_usX2Y_Out04Int(struct urb* urb, struct pt_regs *regs); +void snd_usX2Y_In04Int(struct urb* urb, struct pt_regs *regs); #else -void snd_usX2Y_Out04Int(urb_t* urb); -void snd_usX2Y_In04Int(urb_t* urb); +void snd_usX2Y_Out04Int(struct urb* urb); +void snd_usX2Y_In04Int(struct urb* urb); #endif #ifndef CONFIG_SND_DEBUG Index: usbusx2yaudio.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2yaudio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- usbusx2yaudio.c 27 Nov 2003 14:57:51 -0000 1.2 +++ usbusx2yaudio.c 2 Dec 2003 10:15:02 -0000 1.3 @@ -345,7 +345,7 @@ /* * complete callback from data urb */ -static void _snd_usX2Y_urb_play_complete(purb_t urb) +static void _snd_usX2Y_urb_play_complete(struct urb* urb) { snd_usX2Y_substream_t *subs = (snd_usX2Y_substream_t*)urb->context; snd_pcm_substream_t *substream = subs->pcm_substream; @@ -369,7 +369,7 @@ } } -static void snd_usX2Y_urb_play_complete(purb_t urb, struct pt_regs *regs) +static void snd_usX2Y_urb_play_complete(struct urb* urb, struct pt_regs *regs) { snd_usX2Y_substream_t *subs = (snd_usX2Y_substream_t*)urb->context; if (! subs->stream->usX2Y->pipe0Aframes[0][0]) { @@ -383,7 +383,7 @@ /* * complete callback from data urb */ -static void snd_usX2Y_urb_capt_complete(purb_t urb, struct pt_regs *regs) +static void snd_usX2Y_urb_capt_complete(struct urb* urb, struct pt_regs *regs) { snd_usX2Y_substream_t *captsubs = (snd_usX2Y_substream_t*)urb->context; snd_pcm_substream_t *pcm_captsubs = captsubs->pcm_substream; @@ -663,7 +663,7 @@ /* * release a urb data */ -static void release_urb_ctx(purb_t* urb, int free_tb) +static void release_urb_ctx(struct urb** urb, int free_tb) { if (*urb) { if (free_tb) @@ -774,9 +774,9 @@ } #ifndef OLD_USB -static void snd_usX2Y_04Int(urb_t* urb, struct pt_regs *regs) +static void snd_usX2Y_04Int(struct urb* urb, struct pt_regs *regs) #else -static void snd_usX2Y_04Int(urb_t* urb) +static void snd_usX2Y_04Int(struct urb* urb) #endif { usX2Ydev_t* usX2Y = urb->context; @@ -884,12 +884,12 @@ if (usX2Y_stream->usX2Y->rate != rate) { do { - us = kmalloc(sizeof(*us) + sizeof(urb_t*) * NOOF_SETRATE_URBS, GFP_KERNEL); + us = kmalloc(sizeof(*us) + sizeof(struct urb*) * NOOF_SETRATE_URBS, GFP_KERNEL); if (NULL == us) { err = -ENOMEM; break; } - memset(us, 0, sizeof(*us) + sizeof(urb_t*) * NOOF_SETRATE_URBS); + memset(us, 0, sizeof(*us) + sizeof(struct urb*) * NOOF_SETRATE_URBS); usbdata = kmalloc(sizeof(int)*NOOF_SETRATE_URBS, GFP_KERNEL); if (NULL == usbdata) { err = -ENOMEM; ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog