lkml.org 
[lkml]   [1998]   [Jan]   [3]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateSat, 3 Jan 98 22:25 GMT
From(Alan Cox)
SubjectFollow up changes
These follow the big patch and fix HFS as a non module and bw-qcam as a 
non module

--- linux/drivers/char/bw-qcam.c.old	Sat Jan  3 21:17:01 1998
+++ linux/drivers/char/bw-qcam.c	Sat Jan  3 21:20:38 1998
@@ -1,8 +1,6 @@
 /*
  *    QuickCam Driver For Video4Linux.
  *
- *	This version only works as a module.
- *
  *	Video4Linux conversion work by Alan Cox.
  */
 
@@ -843,6 +841,8 @@
 };
 
 
+#ifdef MODULE
+
 int io=0x378;
 
 MODULE_PARM(io,"i");
@@ -877,3 +877,35 @@
 	video_unregister_device(&qcam->vdev);
 	kfree(qcam);
 }
+
+#else
+
+void init_bw_qcams(void)
+{
+	int io_ports[3]={0x278,0x378, 0x3BC};
+	struct qcam_device *qcam;
+	int i;
+	
+	for(i=0;i<3;i++)
+	{
+		qcam=qcam_init(io_ports[i]);
+		if(qcam==NULL)
+			continue;
+		
+		qc_reset(qcam);
+	
+		if(qc_detect(qcam)==0)
+		{
+			kfree(qcam);
+			continue;
+		}
+		qc_calibrate(qcam);
+	
+		printk(KERN_INFO "Connectix Quickcam at 0x%03X\n", qcam->port);
+	
+		if(video_register_device(&qcam->vdev)==-1)
+			return -ENODEV;
+	}
+}
+
+#endif
--- linux/fs/filesystems.c.old	Sat Jan  3 21:22:08 1998
+++ linux/fs/filesystems.c	Sat Jan  3 21:23:26 1998
@@ -25,6 +25,7 @@
 #include <linux/romfs_fs.h>
 #include <linux/auto_fs.h>
 #include <linux/ntfs_fs.h>
+#include <linux/hfs_fs.h>
 #include <linux/major.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
@@ -112,6 +113,10 @@
 
 #ifdef CONFIG_NTFS_FS
 	init_ntfs_fs();
+#endif
+
+#ifdef CONFIG_HFS_FS
+	init_hfs_fs();
 #endif
 
 #ifdef CONFIG_AFFS_FS
\
 
 \ /
  Last update: 2005-03-22 12:41    [W:0.611 / U:0.220 seconds]
©2003-2008 Jasper Spaans