-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathsvgalib-helper-1.25-kernel-2.6.36.patch
269 lines (243 loc) · 9.78 KB
/
svgalib-helper-1.25-kernel-2.6.36.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
diff -Nru svgalib_helper.old//kernel26compat.h svgalib_helper.new//kernel26compat.h
--- svgalib_helper.old//kernel26compat.h 2006-05-20 21:17:13.000000000 +0900
+++ svgalib_helper.new//kernel26compat.h 2009-01-24 12:56:39.000000000 +0800
@@ -10,7 +10,7 @@
# define PCI_GET_CLASS pci_find_class
# define PCI_GET_DEVICE pci_find_device
-# if defined (PG_chainlock)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
# define my_io_remap_page_range(vma, start, ofs, len, prot) \
io_remap_page_range(vma,start,ofs,len,prot)
# else
@@ -70,6 +70,7 @@
/* These are also not present in 2.6 kernels ... */
#if (!defined _LINUX_DEVFS_FS_KERNEL_H) || (defined KERNEL_2_6)
+#include <linux/fs.h>
static inline int devfs_register_chrdev (unsigned int major, const char *name,
struct file_operations *fops)
{
@@ -77,7 +78,12 @@
}
static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
{
- return unregister_chrdev (major, name);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ return unregister_chrdev (major, name);
+#else
+ unregister_chrdev (major, name);
+ return 0;
+#endif
}
#endif
@@ -99,7 +105,8 @@
class_device_create(svgalib_helper_class, \
MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
&sh_pci_devs[_minor]->dev->dev, _name);
-#else /* 2.6.15 changed class_device_create */
+/* 2.6.15 changed class_device_create */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
# define SLH_SYSFS_ADD_CONTROL \
class_device_create(svgalib_helper_class, NULL, \
MKDEV(SVGALIB_HELPER_MAJOR, 0), \
@@ -109,7 +116,42 @@
class_device_create(svgalib_helper_class, NULL, \
MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
&sh_pci_devs[_minor]->dev->dev, _name);
-#endif /* 2.6.15 */
+/* 2.6.26 changed class_device_create to device_create */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+# define SLH_SYSFS_ADD_CONTROL \
+ device_create(svgalib_helper_class, NULL, \
+ MKDEV(SVGALIB_HELPER_MAJOR, 0), \
+ "svga");
+
+# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
+ device_create(svgalib_helper_class, &sh_pci_devs[_minor]->dev->dev, \
+ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
+ _name);
+/* 2.6.27 changed device_create to device_create_drvdata */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+# define SLH_SYSFS_ADD_CONTROL \
+ device_create_drvdata(svgalib_helper_class, NULL, \
+ MKDEV(SVGALIB_HELPER_MAJOR, 0), \
+ "%s%d", "svga", 0);
+
+# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
+ device_create_drvdata(svgalib_helper_class, \
+ &sh_pci_devs[_minor]->dev->dev, \
+ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
+ "%s%d", _name, _minor);
+/* 2.6.28 changed device_create_drvdata back to device_create */
+#else
+# define SLH_SYSFS_ADD_CONTROL \
+ device_create(svgalib_helper_class, NULL, \
+ MKDEV(SVGALIB_HELPER_MAJOR, 0), NULL, \
+ "%s%d", "svga", 0);
+
+# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
+ device_create(svgalib_helper_class, \
+ &sh_pci_devs[_minor]->dev->dev, \
+ MKDEV(SVGALIB_HELPER_MAJOR, _minor), NULL, \
+ "%s%d", _name, _minor);
+#endif
# define SLH_SYSFS_REMOVE_DEVICE(i) \
class_destroy(svgalib_helper_class);
@@ -161,3 +203,7 @@
#ifndef PCI_VENDOR_ID_RENDITION
#define PCI_VENDOR_ID_RENDITION 0x1163
#endif
+
+#ifndef IRQF_SHARED
+# define IRQF_SHARED SA_SHIRQ
+#endif
diff -Nru svgalib_helper.old//main.c svgalib_helper.new//main.c
--- svgalib_helper.old//main.c 2006-01-13 02:17:53.000000000 +0800
+++ svgalib_helper.new//main.c 2010-10-25 22:56:53.000000000 +0900
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
# define MODVERSIONS
#endif
@@ -17,15 +15,22 @@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/devfs_fs_kernel.h>
+#endif
#include <linux/mm.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <linux/thread_info.h>
+#endif
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/sched.h>
#include <linux/wait.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <linux/syscalls.h>
+#endif
#define __KERNEL_SYSCALLS__
#include <linux/unistd.h>
@@ -50,7 +55,7 @@
#include "displaystart.h"
int debug=0;
-static int all_devices=0;
+int all_devices=0;
int num_devices=0;
static char *sdev_id="svgalib_helper";
@@ -98,7 +103,11 @@
static volatile int vsync=0;
static wait_queue_head_t vsync_wait;
-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t vsync_interrupt(int irq, void *dev_id
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+, struct pt_regs *regs
+#endif
+)
{
struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
@@ -154,9 +163,12 @@
get_user(pciv.val, &user_pciv->val);
#define PUT_PCIV \
put_user(pciv.val, &user_pciv->val);
-static int svgalib_helper_ioctl( struct inode *inode, struct file *filp,
+//static int svgalib_helper_ioctl( struct inode *inode, struct file *filp,
+// unsigned int cmd, unsigned long arg) {
+static long svgalib_helper_ioctl(struct file *filp,
unsigned int cmd, unsigned long arg) {
-
+
+ struct inode *inode=filp->f_dentry->d_inode;
io_t iov, *user_iov=(io_t *)arg;
pcic_t pciv, *user_pciv=(pcic_t *)arg;
int minor = my_minor(inode->i_rdev);
@@ -173,7 +185,7 @@
}
ret=0;
-
+
switch(_IOC_NR(cmd)) {
case _IOC_NR(SVGAHELPER_REPOUTB):
@@ -355,7 +367,7 @@
vsync=1;
i=0;
while(irqs[i]!=-1)
- request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id);
+ request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id);
vga_enable_vsync((void *)sdev_id);
wait_event_interruptible(vsync_wait, !vsync);
i=0;
@@ -443,7 +455,7 @@
int i=sh_pci_devs[minor]->dev->irq;
sh_pci_devs[minor]->opencount++;
if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255)
- request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]);
+ request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]);
}
#ifndef KERNEL_2_6
@@ -586,7 +598,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
.owner = THIS_MODULE,
#endif
- .ioctl = svgalib_helper_ioctl,
+ .unlocked_ioctl = svgalib_helper_ioctl,
.mmap = svgalib_helper_mmap,
.open = svgalib_helper_open,
.release = svgalib_helper_release,
@@ -763,10 +775,15 @@
}
+#ifdef KERNEL_2_6
+module_param(debug, int, 0);
+module_param(all_devices, int, 0);
+#else
MODULE_PARM(debug, "i");
-MODULE_PARM_DESC(debug, "Debug output level.");
-
MODULE_PARM(all_devices, "i");
+#endif
+
+MODULE_PARM_DESC(debug, "Debug output level.");
MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class.");
diff -Nru svgalib_helper.old//Makefile svgalib_helper.new//Makefile
--- svgalib_helper.old//Makefile 2006-05-20 21:31:04.000000000 +0900
+++ svgalib_helper.new//Makefile 2009-01-24 12:56:11.000000000 +0800
@@ -25,7 +25,7 @@
endif
-CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h)
+CLASS_SIMPLE := $(shell grep -s class_simple_create $(KDIR)/include/linux/device.h)
ifneq ($(CLASS_SIMPLE),)
CLASS_CFLAGS = -DCLASS_SIMPLE=1
diff -Nru svgalib_helper.old//Makefile.alt svgalib_helper.new//Makefile.alt
--- svgalib_helper.old//Makefile.alt 2003-12-04 17:16:40.000000000 +0800
+++ svgalib_helper.new//Makefile.alt 2009-01-24 12:56:11.000000000 +0800
@@ -37,7 +37,7 @@
CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
ifeq (1,$(findstring 1,$(MODVER)))
- CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
+ CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1
endif
TARGET = svgalib_helper
@@ -50,7 +50,8 @@
endif
endif
-all: .depend $(OBJS)
+modules: $(OBJS)
+all: .depend modules
$(TARGET).o: $(SRC:.c=.o)
$(LD) -r $^ -o $@
@@ -61,8 +62,8 @@
install: device modules_install
modules_install: $(OBJS)
- mkdir -p /lib/modules/$(VER)/kernel/misc
- install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc
+ mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
+ install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc
device:
rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
diff -Nru svgalib_helper.old//modules.order svgalib_helper.new//modules.order
--- svgalib_helper.old//modules.order 1970-01-01 08:00:00.000000000 +0800
+++ svgalib_helper.new//modules.order 2010-10-25 22:56:56.000000000 +0900
@@ -0,0 +1 @@
+kernel//usr/src/svgalib-1.9.25/kernel/svgalib_helper/svgalib_helper.ko