patch-2.4.20 linux-2.4.20/drivers/sound/emu10k1/hwaccess.h

Next file: linux-2.4.20/drivers/sound/emu10k1/main.c
Previous file: linux-2.4.20/drivers/sound/emu10k1/hwaccess.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/sound/emu10k1/hwaccess.h linux-2.4.20/drivers/sound/emu10k1/hwaccess.h
@@ -145,7 +145,7 @@
 	u16			emupagetable[MAXPAGES];
 
 	struct list_head	timers;
-	unsigned		timer_delay;
+	u16			timer_delay;
 	spinlock_t		timer_lock;
 
 	struct pci_dev		*pci_dev;
@@ -191,8 +191,6 @@
 int emu10k1_addxmgr_alloc(u32, struct emu10k1_card *);
 void emu10k1_addxmgr_free(struct emu10k1_card *, int);
 
-
-
 int emu10k1_find_control_gpr(struct patch_manager *, const char *, const char *);
 void emu10k1_set_control_gpr(struct emu10k1_card *, int , s32, int );
 
@@ -212,11 +210,13 @@
 
 /* Hardware Abstraction Layer access functions */
 
-void emu10k1_writefn0(struct emu10k1_card *, u32 , u32 );
-u32 emu10k1_readfn0(struct emu10k1_card *, u32 );
+void emu10k1_writefn0(struct emu10k1_card *, u32, u32);
+u32 emu10k1_readfn0(struct emu10k1_card *, u32);
+
+void emu10k1_timer_set(struct emu10k1_card *, u16);
 
-void sblive_writeptr(struct emu10k1_card *, u32 , u32 , u32 );
-void sblive_writeptr_tag(struct emu10k1_card *card, u32 channel, ...);
+void sblive_writeptr(struct emu10k1_card *, u32, u32, u32);
+void sblive_writeptr_tag(struct emu10k1_card *, u32, ...);
 #define TAGLIST_END	0
 
 u32 sblive_readptr(struct emu10k1_card *, u32 , u32 );

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)