* [PATCH] skeletonfb correction
@ 2007-04-09 4:58 Krzysztof Helt
0 siblings, 0 replies; only message in thread
From: Krzysztof Helt @ 2007-04-09 4:58 UTC (permalink / raw)
To: linux-fbdev-devel
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
This is mainly correction of types, typos and missing characters
in the skeletonfb.c file found while trying to prepare a new fb
driver.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
---
----------------------------------------------------
Zobacz Scarlett Johansson i Hugh Jackmana
w najnowszej komedii Woody'ego Allena
SCOOP - GORĄCY TEMAT - w kinach od 13 kwietnia!
http://klik.wp.pl/?adr=http%3A%2F%2Fadv.reklama.wp.pl%2Fas%2Fscoop.html&sid=1094
[-- Attachment #2: skeletonfb-fixes.diff --]
[-- Type: application/octet-stream, Size: 7682 bytes --]
diff -urp linux-2.6.21.orig/drivers/video/skeletonfb.c linux-2.6.21/drivers/video/skeletonfb.c
--- linux-2.6.21.orig/drivers/video/skeletonfb.c 2007-03-26 00:56:23.000000000 +0200
+++ linux-2.6.21/drivers/video/skeletonfb.c 2007-04-08 23:33:24.000000000 +0200
@@ -51,6 +51,9 @@
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/init.h>
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#endif
/*
* This is just simple sample code.
@@ -60,6 +63,11 @@
*/
/*
+ * Driver data
+ */
+static char *mode_option __devinitdata = NULL;
+
+/*
* If your driver supports multiple boards, you should make the
* below data types arrays, or allocate them dynamically (using kmalloc()).
*/
@@ -278,7 +286,7 @@ static int xxxfb_set_par(struct fb_info
*/
static int xxxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp,
- const struct fb_info *info)
+ struct fb_info *info)
{
if (regno >= 256) /* no. of hw registers */
return -EINVAL;
@@ -416,7 +424,7 @@ static int xxxfb_setcolreg(unsigned regn
* Returns negative errno on error, or zero on success.
*/
static int xxxfb_pan_display(struct fb_var_screeninfo *var,
- const struct fb_info *info)
+ struct fb_info *info)
{
/*
* If your hardware does not support panning, _do_ _not_ implement this
@@ -454,7 +462,7 @@ static int xxxfb_pan_display(struct fb_v
* Return !0 for any modes that are unimplemented.
*
*/
-static int xxxfb_blank(int blank_mode, const struct fb_info *info)
+static int xxxfb_blank(int blank_mode, struct fb_info *info)
{
/* ... */
return 0;
@@ -483,7 +491,7 @@ static int xxxfb_blank(int blank_mode, c
* depending on the rastering operation with the value of color which
* is in the current color depth format.
*/
-void xxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region)
+void xxxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region)
{
/* Meaning of struct fb_fillrect
*
@@ -647,21 +655,50 @@ void xxxfb_poll(struct fb_info *info, po
* If the driver has implemented its own hardware-based drawing function,
* implementing this function is highly recommended.
*/
-void xxxfb_sync(struct fb_info *info)
+int xxxfb_sync(struct fb_info *info)
{
+ return 0;
}
/*
+ * Frame buffer operations
+ */
+
+static struct fb_ops xxxfb_ops = {
+ .owner = THIS_MODULE,
+ .fb_open = xxxfb_open,
+ .fb_read = xxxfb_read,
+ .fb_write = xxxfb_write,
+ .fb_release = xxxfb_release,
+ .fb_check_var = xxxfb_check_var,
+ .fb_set_par = xxxfb_set_par,
+ .fb_setcolreg = xxxfb_setcolreg,
+ .fb_blank = xxxfb_blank,
+ .fb_pan_display = xxxfb_pan_display,
+ .fb_fillrect = xxxfb_fillrect, /* Needed !!! */
+ .fb_copyarea = xxxfb_copyarea, /* Needed !!! */
+ .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
+ .fb_cursor = xxxfb_cursor, /* Optional !!! */
+ .fb_rotate = xxxfb_rotate,
+ .fb_poll = xxxfb_poll,
+ .fb_sync = xxxfb_sync,
+ .fb_ioctl = xxxfb_ioctl,
+ .fb_mmap = xxxfb_mmap,
+};
+
+/* ------------------------------------------------------------------------- */
+
+ /*
* Initialization
*/
/* static int __init xxfb_probe (struct device *device) -- for platform devs */
-static int __init xxxfb_probe(struct pci_dev *dev,
+static int __devinit xxxfb_probe(struct pci_dev *dev,
const_struct pci_device_id *ent)
{
struct fb_info *info;
struct xxx_par *par;
- struct device = &dev->dev; /* for pci drivers */
+ struct device* device = &dev->dev; /* for pci drivers */
int cmap_len, retval;
/*
@@ -760,7 +797,7 @@ static int __init xxxfb_probe(struct pci
*
* NOTE: This field is currently unused.
*/
- info->pixmap.scan_align = 32
+ info->pixmap.scan_align = 32;
/***************************** End optional stage ***************************/
/*
@@ -770,13 +807,13 @@ static int __init xxxfb_probe(struct pci
if (!mode_option)
mode_option = "640x480@60";
- retval = fb_find_mode(info->var, info, mode_option, NULL, 0, NULL, 8);
+ retval = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
if (!retval || retval == 4)
return -EINVAL;
/* This has to been done !!! */
- fb_alloc_cmap(info->cmap, cmap_len, 0);
+ fb_alloc_cmap(&info->cmap, cmap_len, 0);
/*
* The following is done in the case of having hardware with a static
@@ -811,15 +848,15 @@ static int __init xxxfb_probe(struct pci
/*
* Cleanup
*/
-/* static void __exit xxxfb_remove(struct device *device) */
-static void __exit xxxfb_remove(struct pci_dev *dev)
+/* static void __devexit xxxfb_remove(struct device *device) */
+static void __devexit xxxfb_remove(struct pci_dev *dev)
{
- struct fb_info *info = pci_get_drv_data(dev);
- /* or dev_get_drv_data(device); */
+ struct fb_info *info = pci_get_drvdata(dev);
+ /* or dev_get_drvdata(device); */
if (info) {
unregister_framebuffer(info);
- fb_dealloc_cmap(&info.cmap);
+ fb_dealloc_cmap(&info->cmap);
/* ... */
framebuffer_release(info);
}
@@ -827,18 +864,25 @@ static void __exit xxxfb_remove(struct p
return 0;
}
-#if CONFIG_PCI
+#ifdef CONFIG_PCI
+static struct pci_device_id xxxfb_id_table[] = {
+ { PCI_VENDOR_ID_XXX, PCI_DEVICE_ID_XXX,
+ PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
+ ADDR, 0 },
+ { 0, }
+};
+
/* For PCI drivers */
static struct pci_driver xxxfb_driver = {
.name = "xxxfb",
- .id_table = xxxfb_devices,
+ .id_table = xxxfb_id_table,
.probe = xxxfb_probe,
.remove = __devexit_p(xxxfb_remove),
.suspend = xxxfb_suspend, /* optional */
.resume = xxxfb_resume, /* optional */
};
-static int __init xxxfb_init(void)
+int __init xxxfb_init(void)
{
/*
* For kernel boot options (in 'video=xxxfb:<options>' format)
@@ -854,10 +898,12 @@ static int __init xxxfb_init(void)
return pci_register_driver(&xxxfb_driver);
}
+#ifdef MODULE
static void __exit xxxfb_exit(void)
{
pci_unregister_driver(&xxxfb_driver);
}
+#endif
#else
#include <linux/platform_device.h>
/* for platform devices */
@@ -898,13 +944,16 @@ static int __init xxxfb_init(void)
return ret;
}
+#ifdef MODULE
static void __exit xxxfb_exit(void)
{
platform_device_unregister(&xxxfb_device);
driver_unregister(&xxxfb_driver);
}
#endif
+#endif
+#ifdef MODULE
/*
* Setup
*/
@@ -917,34 +966,7 @@ int __init xxxfb_setup(char *options)
{
/* Parse user speficied options (`video=xxxfb:') */
}
-
-/* ------------------------------------------------------------------------- */
-
- /*
- * Frame buffer operations
- */
-
-static struct fb_ops xxxfb_ops = {
- .owner = THIS_MODULE,
- .fb_open = xxxfb_open,
- .fb_read = xxxfb_read,
- .fb_write = xxxfb_write,
- .fb_release = xxxfb_release,
- .fb_check_var = xxxfb_check_var,
- .fb_set_par = xxxfb_set_par,
- .fb_setcolreg = xxxfb_setcolreg,
- .fb_blank = xxxfb_blank,
- .fb_pan_display = xxxfb_pan_display,
- .fb_fillrect = xxxfb_fillrect, /* Needed !!! */
- .fb_copyarea = xxxfb_copyarea, /* Needed !!! */
- .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
- .fb_cursor = xxxfb_cursor, /* Optional !!! */
- .fb_rotate = xxxfb_rotate,
- .fb_poll = xxxfb_poll,
- .fb_sync = xxxfb_sync,
- .fb_ioctl = xxxfb_ioctl,
- .fb_mmap = xxxfb_mmap,
-};
+#endif
/* ------------------------------------------------------------------------- */
@@ -954,6 +976,8 @@ static struct fb_ops xxxfb_ops = {
*/
module_init(xxxfb_init);
-module_exit(xxxfb_cleanup);
+#ifdef MODULE
+module_exit(xxxfb_remove);
MODULE_LICENSE("GPL");
+#endif
[-- Attachment #3: Type: text/plain, Size: 345 bytes --]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
[-- Attachment #4: Type: text/plain, Size: 182 bytes --]
_______________________________________________
Linux-fbdev-devel mailing list
Linux-fbdev-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-04-09 4:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-09 4:58 [PATCH] skeletonfb correction Krzysztof Helt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.