Attachment #76057 for bug #115316

View | Details | Raw Unified | Return to bug 115316
Collapse All | Expand All




                    dev->disable_vsync = rage_ack_vsync;
            }
            break;
//        case PCI_VENDOR_ID_RENDITION:
//            dev->iobase = dev->mem[1];
//            dev->test_vsync = rendition_test_vsync;
//            dev->ack_vsync = rendition_ack_vsync;
//            dev->enable_vsync = rendition_enable_vsync;
//            dev->disable_vsync = rendition_ack_vsync;
//            break;
		case PCI_VENDOR_ID_S3:
			dev->membase = ioremap(dev->mem[0]+0x1000000, 0x10000);
            dev->test_vsync = s3_test_vsync;

Lines 84-89 Link Here

(-)svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/kernel26compat.h (+17 lines)
84	# define SLH_SYSFS_REGISTER \	84	# define SLH_SYSFS_REGISTER \
85	svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper");	85	svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper");
86		86
		87
		88	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
		89
		90	# define SLH_SYSFS_ADD_CONTROL \
		91	class_device_create(svgalib_helper_class, NULL, \
		92	MKDEV(SVGALIB_HELPER_MAJOR, 0), \
		93	NULL, "svga");
		94
		95	# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
		96	class_device_create(svgalib_helper_class, NULL, \
		97	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
		98	&sh_pci_devs[_minor]->dev->dev, _name);
		99	#else
		100
		101
87	# define SLH_SYSFS_ADD_CONTROL \	102	# define SLH_SYSFS_ADD_CONTROL \
88	class_device_create(svgalib_helper_class, \	103	class_device_create(svgalib_helper_class, \
89	MKDEV(SVGALIB_HELPER_MAJOR, 0), \	104	MKDEV(SVGALIB_HELPER_MAJOR, 0), \
Lines 93-98 Link Here
93	class_device_create(svgalib_helper_class, \	108	class_device_create(svgalib_helper_class, \
94	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \	109	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
95	&sh_pci_devs[_minor]->dev->dev, _name);	110	&sh_pci_devs[_minor]->dev->dev, _name);
		111	#endif
		112
96		113
97	# define SLH_SYSFS_REMOVE_DEVICE(i) \	114	# define SLH_SYSFS_REMOVE_DEVICE(i) \
98	class_destroy(svgalib_helper_class);	115	class_destroy(svgalib_helper_class);

Return to bug 115316

Lines 283-295 Link Here

(-)svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/interrupt.c (-7 / +7 lines)
283	dev->disable_vsync = rage_ack_vsync;	283	dev->disable_vsync = rage_ack_vsync;
284	}	284	}
285	break;	285	break;
286	case PCI_VENDOR_ID_RENDITION:	286	// case PCI_VENDOR_ID_RENDITION:
287	dev->iobase = dev->mem[1];	287	// dev->iobase = dev->mem[1];
288	dev->test_vsync = rendition_test_vsync;	288	// dev->test_vsync = rendition_test_vsync;
289	dev->ack_vsync = rendition_ack_vsync;	289	// dev->ack_vsync = rendition_ack_vsync;
290	dev->enable_vsync = rendition_enable_vsync;	290	// dev->enable_vsync = rendition_enable_vsync;
291	dev->disable_vsync = rendition_ack_vsync;	291	// dev->disable_vsync = rendition_ack_vsync;
292	break;	292	// break;
293	case PCI_VENDOR_ID_S3:	293	case PCI_VENDOR_ID_S3:
294	dev->membase = ioremap(dev->mem[0]+0x1000000, 0x10000);	294	dev->membase = ioremap(dev->mem[0]+0x1000000, 0x10000);
295	dev->test_vsync = s3_test_vsync;	295	dev->test_vsync = s3_test_vsync;