[CVS] km km.c,1.58,1.59 km_api.c,1.27,1.28 mach64.c,1.39,1.40 radeon.c,1.56,1.57 radeon.h,1.8,1.9 rage128.c,1.32,1.33

[<gat...@li...>]

Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv19224

Modified Files:
	km.c km_api.c mach64.c radeon.c radeon.h rage128.c 
Log Message:
Cleanup and fixes.


Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- km.c	26 Jan 2003 20:33:23 -0000	1.58
+++ km.c	27 Jan 2003 02:43:07 -0000	1.59
@@ -524,9 +524,6 @@
 	kms->reg_aperture);
 num_devices++;
 return 0;
-
-fail:
-	return -1;
 }
 
 

Index: km_api.c
===================================================================
RCS file: /cvsroot/gatos/km/km_api.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- km_api.c	25 Jan 2003 07:48:10 -0000	1.27
+++ km_api.c	27 Jan 2003 02:43:07 -0000	1.28
@@ -209,7 +209,7 @@
 kmd->use_count--;
 if(kmd->use_count<=0){
 	devices[kmd->number]=NULL;
-	sprintf(temp, "control%d", kmd->number);
+	sprintf(temp, "control%ld", kmd->number);
 	remove_proc_entry(temp, km_root);
 	kmd->control=NULL;
 	kfree(kmd);

Index: mach64.c
===================================================================
RCS file: /cvsroot/gatos/km/mach64.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mach64.c	26 Jan 2003 20:33:25 -0000	1.39
+++ mach64.c	27 Jan 2003 02:43:07 -0000	1.40
@@ -168,8 +168,8 @@
 KM_DEBUG("CRTC_INT_CNTL=0x%08x\n", status);
 /* do not start dma transfer if capture is not active anymore */
 if(!mach64_is_capture_active(kms))return 1;
-if(status & MACH64_CAPBUF0_INT_ACK)mach64_schedule_request(kms, find_free_buffer(kms), 0);
-if(status & MACH64_CAPBUF1_INT_ACK)mach64_schedule_request(kms, find_free_buffer(kms), 1); 
+if(status & MACH64_CAPBUF0_INT_ACK)mach64_schedule_request(kms, find_free_buffer(&(kms->capture)), 0);
+if(status & MACH64_CAPBUF1_INT_ACK)mach64_schedule_request(kms, find_free_buffer(&(kms->capture)), 1); 
 return 1;
 }
 

Index: radeon.c
===================================================================
RCS file: /cvsroot/gatos/km/radeon.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- radeon.c	26 Jan 2003 20:33:25 -0000	1.56
+++ radeon.c	27 Jan 2003 02:43:07 -0000	1.57
@@ -251,10 +251,10 @@
 KM_DEBUG("CAP_INT_STATUS=0x%08x\n", status);
 /* do not start dma transfer if capture is not active anymore */
 if(!kms->capture_active)return 1;
-if(status & 1)radeon_schedule_request(kms, find_free_buffer(kms), 0);
-if(status & 2)radeon_schedule_request(kms, find_free_buffer(kms), 1);
-if(status & 4)radeon_schedule_request(kms, find_free_buffer(kms), 2);
-if(status & 8)radeon_schedule_request(kms, find_free_buffer(kms), 3);
+if(status & 1)radeon_schedule_request(kms, find_free_buffer(&(kms->capture)), 0);
+if(status & 2)radeon_schedule_request(kms, find_free_buffer(&(kms->capture)), 1);
+if(status & 4)radeon_schedule_request(kms, find_free_buffer(&(kms->capture)), 2);
+if(status & 8)radeon_schedule_request(kms, find_free_buffer(&(kms->capture)), 3);
 return 1;
 }
 
@@ -366,12 +366,10 @@
 return 0;
 }
 
-/* setup statistics counting.. */
-int radeon_uninit_hardware(KM_STRUCT *kms)
+void radeon_uninit_hardware(KM_STRUCT *kms)
 {
 u32 a;
 
 a=readl(kms->reg_aperture+RADEON_GEN_INT_CNTL);
 writel(a& ~((7)|(1<<30)), kms->reg_aperture+RADEON_GEN_INT_CNTL);
-return 0;
 }

Index: radeon.h
===================================================================
RCS file: /cvsroot/gatos/km/radeon.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- radeon.h	23 Oct 2002 03:25:39 -0000	1.8
+++ radeon.h	27 Jan 2003 02:43:07 -0000	1.9
@@ -15,7 +15,7 @@
 void radeon_stop_transfer(KM_STRUCT *kms);
 void radeon_km_irq(int irq, void *dev_id, struct pt_regs *regs);
 int radeon_init_hardware(KM_STRUCT *kms);
-int radeon_uninit_hardware(KM_STRUCT *kms);
+void radeon_uninit_hardware(KM_STRUCT *kms);
 
 
 

Index: rage128.c
===================================================================
RCS file: /cvsroot/gatos/km/rage128.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rage128.c	26 Jan 2003 20:33:25 -0000	1.32
+++ rage128.c	27 Jan 2003 02:43:07 -0000	1.33
@@ -181,8 +181,8 @@
 writel(status & mask, kms->reg_aperture+RAGE128_CAP_INT_STATUS);
 /* do not start dma transfer if capture is not active anymore */
 if(!rage128_is_capture_active(kms))return 1;
-if(status & 1)rage128_schedule_request(kms, find_free_buffer(kms), 0);
-if(status & 2)rage128_schedule_request(kms, find_free_buffer(kms), 1); 
+if(status & 1)rage128_schedule_request(kms, find_free_buffer(&(kms->capture)), 0);
+if(status & 2)rage128_schedule_request(kms, find_free_buffer(&(kms->capture)), 1); 
 return 1;
 }