patch-2.4.0-test2 linux/drivers/video/cyber2000fb.h

• Lines: 66
• Date: Tue Jun 20 14:14:51 2000
• Orig file: v2.4.0-test1/linux/drivers/video/cyber2000fb.h
• Orig date: Tue May 23 15:31:35 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/video/cyber2000fb.h linux/drivers/video/cyber2000fb.h
@@ -127,6 +127,8 @@
 #define CAP_DDA_Y_INIT		0x6c
 #define CAP_DDA_Y_INC		0x6e
 
+#define MEM_CTL1		0x71
+
 #define MEM_CTL2		0x72
 #define MEM_CTL2_SIZE_2MB		0x01
 #define MEM_CTL2_SIZE_4MB		0x02
@@ -156,6 +158,11 @@
 #define CAP_MODE1_MIRRORY		0x40	/* mirror vertically			*/
 #define CAP_MODE1_MIRRORX		0x80	/* mirror horizontally			*/
 
+#define DCLK_MULT		0xb0
+#define DCLK_DIV		0xb1
+#define MCLK_MULT		0xb2
+#define MCLK_DIV		0xb3
+
 #define CAP_MODE2		0xa5
 
 #define Y_TV_CTL		0xae
@@ -281,6 +288,11 @@
 #define CO_REG_DEST_PTR		0xbf178
 #define CO_REG_DEST_WIDTH	0xbf218
 
+/*
+ * Private structure
+ */
+struct cfb_info;
+
 struct cyberpro_info {
 	struct pci_dev	*dev;
 	unsigned char	*regs;
@@ -289,16 +301,27 @@
 	unsigned int	fb_size;
 
 	/*
-	 * Use these to enable the BM or TV registers.
+	 * The following is a pointer to be passed into the
+	 * functions below.  The modules outside the main
+	 * cyber2000fb.c driver have no knowledge as to what
+	 * is within this structure.
+	 */
+	struct cfb_info *info;
+
+	/*
+	 * Use these to enable the BM or TV registers.  In an SMP
+	 * environment, these two function pointers should only be
+	 * called from the module_init() or module_exit()
+	 * functions.
 	 */
-	void (*enable_extregs)(void);
-	void (*disable_extregs)(void);
+	void (*enable_extregs)(struct cfb_info *);
+	void (*disable_extregs)(struct cfb_info *);
 };
 
 /*
  * Note! Writing to the Cyber20x0 registers from an interrupt
  * routine is definitely a bad idea atm.
  */
-int cyber2000fb_attach(struct cyberpro_info *info);
-void cyber2000fb_detach(void);
+int cyber2000fb_attach(struct cyberpro_info *info, int idx);
+void cyber2000fb_detach(int idx);