* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 13:22 [PATCH 2.6.18 V6] drivers: add lcd display support Miguel Ojeda Sandonis
@ 2006-09-30 12:39 ` Jan-Benedict Glaw
2006-09-30 20:10 ` Miguel Ojeda
2006-09-30 19:35 ` Randy Dunlap
1 sibling, 1 reply; 12+ messages in thread
From: Jan-Benedict Glaw @ 2006-09-30 12:39 UTC (permalink / raw)
To: Miguel Ojeda Sandonis; +Cc: akpm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]
On Sat, 2006-09-30 13:22:53 +0000, Miguel Ojeda Sandonis <maxextreme@gmail.com> wrote:
> Patched files Index
> -------------------
> patching file drivers/Kconfig
> patching file drivers/lcddisplay/cfag12864b.c
> patching file drivers/lcddisplay/cfag12864b_image.h
> patching file drivers/lcddisplay/Kconfig
> patching file drivers/lcddisplay/ks0108.c
> patching file drivers/lcddisplay/lcddisplay.c
> patching file drivers/lcddisplay/Makefile
> patching file include/linux/lcddisplay.h
> patching file Documentation/lcddisplay/cfag12864b
> patching file Documentation/lcddisplay/lcddisplay
> patching file Documentation/ioctl-number.txt
AFAIK, the 'D' in LCD is already an abbreviation for "display", so
could we name it lcdisplay or something like that?
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de +49-172-7608481
Signature of: The real problem with C++ for kernel modules is: the language just sucks.
the second : -- Linus Torvalds
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2.6.18 V6] drivers: add lcd display support
@ 2006-09-30 13:22 Miguel Ojeda Sandonis
2006-09-30 12:39 ` Jan-Benedict Glaw
2006-09-30 19:35 ` Randy Dunlap
0 siblings, 2 replies; 12+ messages in thread
From: Miguel Ojeda Sandonis @ 2006-09-30 13:22 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel
miguelojeda-2.6.18-add-lcd-display-support.patch
Changelog (newer first)
-----------------------
V6 - Fixed mistakes found by Andrew Morton
- added locking
- removed "add const to class_create" part, as it is already accepted in 2.6.18-git10
- removed PRINT_PREFIX macro, use KERN_... instead
- reverted bitops to standard |= and &=
- added const to fop's static struct
- added error code checking for class_device_create()
- removed "if(foo > maxfoo) foo=maxfoo;", use min(foo,maxfoo) instead
- coding style:
- used #defined constants directly, not static constants = DEFINED_CONSTANT
- removed blank lines
- changed pointers declarations to "T *name"
- changed for's coding style
- added single spaces around arithmetic operators
- changed counter's nomencalture to i,j,k
- shorter function definitions
- removed newlines at some function calls
- udelay(2)
V5 - Fixed mistakes found by Joe Perches
- coding style
- const, spelling mistake
V4 - Fixed mistakes found by Pavel Machek
- no zero initialization
- GPL version
- use bitop generic functions
V3 - Apply for 2.6.18
- added const to class_create (2.6.18 hasn't add-const-to-class_create.patch)
V2 - Fixed mistakes found by Greg KH
- coding style
V1 - Fixed mistakes found by Alexey Dobriyan
- coding style
- init() and exit() error management
V0 - Original patch
Brief
-----
- Adds const to class_create (2.6.18 hasn't add-const-to-class_create.patch)
- Adds a "lcddisplay" class for registering LCD devices.
- Adds support for the ks0108 LCD Controller as a device driver.
(uses lcddisplay class and parport interface)
- Adds support for the cfag12864b LCD Display as a device driver.
(uses ks0108 device driver)
- Adds a new ioctl() magic number/range (0xFF) in the list for the cfag12864b device.
- Adds the usual Documentation, includes, Makefiles, Kconfigs, MAINTAINERS, CREDITS...
Patched files Index
-------------------
patching file drivers/Kconfig
patching file drivers/lcddisplay/cfag12864b.c
patching file drivers/lcddisplay/cfag12864b_image.h
patching file drivers/lcddisplay/Kconfig
patching file drivers/lcddisplay/ks0108.c
patching file drivers/lcddisplay/lcddisplay.c
patching file drivers/lcddisplay/Makefile
patching file drivers/Makefile
patching file include/linux/cfag12864b.h
patching file include/linux/ks0108.h
patching file include/linux/lcddisplay.h
patching file Documentation/lcddisplay/cfag12864b
patching file Documentation/lcddisplay/lcddisplay
patching file Documentation/ioctl-number.txt
patching file CREDITS
patching file MAINTAINERS
Please review.
miguelojeda-2.6.18-add-lcd-display-support.patch
Signed-off-by: Miguel Ojeda Sandonis <maxextreme@gmail.com>
---
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/Kconfig linux-2.6.18/drivers/Kconfig
--- linux-2.6.18-vanilla/drivers/Kconfig 2006-09-20 03:42:06.000000000 +0000
+++ linux-2.6.18/drivers/Kconfig 2006-09-27 19:15:12.000000000 +0000
@@ -74,4 +74,6 @@ source "drivers/rtc/Kconfig"
source "drivers/dma/Kconfig"
+source "drivers/lcddisplay/Kconfig"
+
endmenu
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b.c linux-2.6.18/drivers/lcddisplay/cfag12864b.c
--- linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b.c 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/cfag12864b.c 2006-09-30 10:56:32.000000000 +0000
@@ -0,0 +1,592 @@
+/*
+ * Filename: cfag12864b.c
+ * Version: 0.1.0
+ * Description: cfag12864b LCD Display Driver
+ * License: GPLv2 or later
+ * Depends: lcddisplay ks0108
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <linux/device.h>
+#include <linux/lcddisplay.h>
+#include <linux/ks0108.h>
+#include <linux/cfag12864b.h>
+#include <asm/uaccess.h>
+
+#define CFAG12864B_NAME "cfag12864b"
+
+/*
+ * Device
+ */
+
+static const unsigned int cfag12864b_firstminor;
+static const unsigned int cfag12864b_ndevices = 1;
+static int cfag12864b_major;
+static int cfag12864b_minor;
+static dev_t cfag12864b_device;
+struct cdev cfag12864b_chardevice;
+DECLARE_MUTEX(cfag12864b_mutex);
+
+/*
+ * cfag12864b Commands
+ */
+
+#define bit(n) (((unsigned char)1)<<(n))
+
+static unsigned char cfag12864b_state;
+
+static void cfag12864b_set(void)
+{
+ ks0108_writecontrol(cfag12864b_state);
+}
+
+static void cfag12864b_setbit(unsigned char state, unsigned char n)
+{
+ if (state)
+ cfag12864b_state |= bit(n);
+ else
+ cfag12864b_state &= ~bit(n);
+ cfag12864b_set();
+}
+
+static void cfag12864b_e(unsigned char state)
+{
+ cfag12864b_setbit(state, 0);
+}
+
+static void cfag12864b_cs1(unsigned char state)
+{
+ cfag12864b_setbit(state, 2);
+}
+
+static void cfag12864b_cs2(unsigned char state)
+{
+ cfag12864b_setbit(state, 1);
+}
+
+static void cfag12864b_di(unsigned char state)
+{
+ cfag12864b_setbit(state, 3);
+}
+
+static void cfag12864b_setcontrollers(unsigned char first, unsigned char second)
+{
+ if (first)
+ cfag12864b_cs1(0);
+ else
+ cfag12864b_cs1(1);
+
+ if (second)
+ cfag12864b_cs2(0);
+ else
+ cfag12864b_cs2(1);
+}
+
+static void cfag12864b_controller(unsigned char which)
+{
+ if (which == 0)
+ cfag12864b_setcontrollers(1, 0);
+ else if (which == 1)
+ cfag12864b_setcontrollers(0, 1);
+}
+
+static void cfag12864b_displaystate(unsigned char state)
+{
+ cfag12864b_di(0);
+ cfag12864b_e(1);
+ ks0108_displaystate(state);
+ cfag12864b_e(0);
+}
+
+static void cfag12864b_address(unsigned char address)
+{
+ cfag12864b_di(0);
+ cfag12864b_e(1);
+ ks0108_address(address);
+ cfag12864b_e(0);
+}
+
+static void cfag12864b_page(unsigned char page)
+{
+ cfag12864b_di(0);
+ cfag12864b_e(1);
+ ks0108_page(page);
+ cfag12864b_e(0);
+}
+
+static void cfag12864b_startline(unsigned char startline)
+{
+ cfag12864b_di(0);
+ cfag12864b_e(1);
+ ks0108_startline(startline);
+ cfag12864b_e(0);
+}
+
+static void cfag12864b_writebyte(unsigned char byte)
+{
+ cfag12864b_di(1);
+ cfag12864b_e(1);
+ ks0108_writedata(byte);
+ cfag12864b_e(0);
+}
+
+static void cfag12864b_nop(void)
+{
+ cfag12864b_startline(0);
+}
+
+/*
+ * Auxiliary
+ */
+
+static void normalizeoffset(unsigned int * offset)
+{
+ if (*offset >= CFAG12864B_PAGES*CFAG12864B_ADDRESSES)
+ *offset -= CFAG12864B_PAGES*CFAG12864B_ADDRESSES;
+}
+
+static unsigned char calcaddress(unsigned int offset)
+{
+ normalizeoffset(&offset);
+ return offset%CFAG12864B_ADDRESSES;
+}
+
+static unsigned char calccontroller(unsigned int offset)
+{
+ if (offset < CFAG12864B_PAGES*CFAG12864B_ADDRESSES)
+ return 0;
+ return 1;
+}
+
+static unsigned char calcpage(unsigned int offset)
+{
+ normalizeoffset(&offset);
+ return offset/CFAG12864B_ADDRESSES;
+}
+
+/*
+ * cfag12864b Internal Commands (don't lock)
+ */
+
+void cfag12864b_on_nolock(void)
+{
+ cfag12864b_setcontrollers(1, 1);
+ cfag12864b_displaystate(1);
+}
+
+void cfag12864b_off_nolock(void)
+{
+ cfag12864b_setcontrollers(1, 1);
+ cfag12864b_displaystate(0);
+}
+
+void cfag12864b_clear_nolock(void)
+{
+ unsigned char i,j;
+
+ cfag12864b_setcontrollers(1, 1);
+ for (i = 0; i < CFAG12864B_PAGES; i++) {
+ cfag12864b_page(i);
+ cfag12864b_address(0);
+ for (j = 0; j < CFAG12864B_ADDRESSES; j++)
+ cfag12864b_writebyte(0);
+ }
+}
+
+void cfag12864b_write_nolock(unsigned short offset, const unsigned char *buffer,
+ unsigned short count)
+{
+ unsigned short i;
+
+ /* Invalid values: They get updated at the first cycle */
+ unsigned char controller = 0xFF;
+ unsigned char page = 0xFF;
+ unsigned char address = 0xFF;
+
+ unsigned char tmpcontroller, tmppage, tmpaddress;
+
+ if (offset > CFAG12864B_SIZE)
+ return;
+ if (count + offset > CFAG12864B_SIZE)
+ count = CFAG12864B_SIZE - offset;
+
+ for (i = 0; i < count; i++, offset++, address++) {
+ tmpcontroller = calccontroller(offset);
+ tmppage = calcpage(offset);
+ tmpaddress = calcaddress(offset);
+
+ if (controller != tmpcontroller) {
+ controller = tmpcontroller;
+ cfag12864b_controller(controller);
+ cfag12864b_nop();
+ }
+ if (page != tmppage) {
+ page = tmppage;
+ cfag12864b_page(page);
+ cfag12864b_nop();
+ }
+
+ /* Safe method, still quick */
+ cfag12864b_address(tmpaddress);
+ cfag12864b_nop();
+
+ /* Dummy */
+ cfag12864b_nop();
+
+ cfag12864b_writebyte(buffer[i]);
+ }
+}
+
+void cfag12864b_format_nolock(unsigned char *src)
+{
+ unsigned short i,j,k,n;
+ unsigned char *dest;
+
+ dest = kmalloc(sizeof(unsigned char) * CFAG12864B_SIZE, GFP_KERNEL);
+ if (dest == NULL) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "format: ERROR: "
+ "can't alloc memory %i bytes\n",
+ sizeof(unsigned char) * CFAG12864B_SIZE);
+ return;
+ }
+
+ for (i = 0; i < CFAG12864B_CONTROLLERS; i++)
+ for (j = 0; j < CFAG12864B_PAGES; j++)
+ for (k = 0; k < CFAG12864B_ADDRESSES; k++) {
+ dest[(i * CFAG12864B_PAGES + j) * CFAG12864B_ADDRESSES + k] = 0;
+ for (n=0; n < 8; n++)
+ if (src[i * CFAG12864B_ADDRESSES + k + (j * 8 + n) * CFAG12864B_WIDTH])
+ dest[(i * CFAG12864B_PAGES + j) * CFAG12864B_ADDRESSES + k] |= bit(n);
+ }
+
+ cfag12864b_write_nolock(0, dest, CFAG12864B_SIZE);
+
+ kfree(dest);
+}
+
+/*
+ * cfag12864b Exported Commands (do lock)
+ */
+
+void cfag12864b_on(void)
+{
+ if(down_interruptible(&cfag12864b_mutex))
+ return;
+
+ cfag12864b_on_nolock();
+
+ up(&cfag12864b_mutex);
+}
+
+void cfag12864b_off(void)
+{
+ if(down_interruptible(&cfag12864b_mutex))
+ return;
+
+ cfag12864b_off_nolock();
+
+ up(&cfag12864b_mutex);
+}
+
+void cfag12864b_clear(void)
+{
+ if(down_interruptible(&cfag12864b_mutex))
+ return;
+
+ cfag12864b_clear_nolock();
+
+ up(&cfag12864b_mutex);
+}
+
+void cfag12864b_write(unsigned short offset, const unsigned char *buffer,
+ unsigned short count)
+{
+ if(down_interruptible(&cfag12864b_mutex))
+ return;
+
+ cfag12864b_write_nolock(offset,buffer,count);
+
+ up(&cfag12864b_mutex);
+}
+
+void cfag12864b_format(unsigned char *src)
+{
+ if(down_interruptible(&cfag12864b_mutex))
+ return;
+
+ cfag12864b_format_nolock(src);
+
+ up(&cfag12864b_mutex);
+}
+
+EXPORT_SYMBOL_GPL(cfag12864b_on);
+EXPORT_SYMBOL_GPL(cfag12864b_off);
+EXPORT_SYMBOL_GPL(cfag12864b_clear);
+EXPORT_SYMBOL_GPL(cfag12864b_write);
+EXPORT_SYMBOL_GPL(cfag12864b_format);
+
+/*
+ * cfag12864b ioctls (don't lock because ioctl fop do)
+ */
+
+static int cfag12864b_fopioctlformat(void __user * arg)
+{
+ int result;
+ int ret = -ENOTTY;
+ unsigned char *tmpbuffer;
+
+ tmpbuffer = kmalloc(
+ sizeof(unsigned char)*CFAG12864B_MATRIXSIZE,GFP_KERNEL);
+ if (tmpbuffer == NULL) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "FOP ioctl: ERROR: "
+ "can't alloc memory %i bytes\n",
+ sizeof(unsigned char)*CFAG12864B_MATRIXSIZE);
+ goto none;
+ }
+
+ result = copy_from_user(tmpbuffer, arg,
+ sizeof(unsigned char) * CFAG12864B_MATRIXSIZE);
+ if (result != 0) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "FOP ioctl: ERROR: "
+ "can't copy memory from user\n");
+ goto bufferalloced;
+ }
+
+ cfag12864b_format_nolock(tmpbuffer);
+
+ ret = 0;
+
+bufferalloced:
+ kfree(tmpbuffer);
+
+none:
+ return ret;
+}
+
+/*
+ * cfag12864b_fops (do lock)
+ */
+
+static loff_t cfag12864b_fopseek(struct file *filp, loff_t offset, int whence)
+{
+ loff_t ret = -EINVAL;
+
+ if(down_interruptible(&cfag12864b_mutex))
+ return -ERESTARTSYS;
+
+ switch(whence) {
+ case SEEK_SET:
+ ret = offset;
+ break;
+ case SEEK_CUR:
+ ret = filp->f_pos + offset;
+ break;
+ case SEEK_END:
+ ret = CFAG12864B_SIZE + offset;
+ break;
+ }
+
+ if (ret < 0) {
+ ret = -EINVAL;
+ goto none;
+ }
+
+ filp->f_pos = ret;
+
+none:
+ up(&cfag12864b_mutex);
+ return ret;
+}
+
+
+static ssize_t cfag12864b_fopwrite(struct file *filp,
+ const char __user *buffer, size_t count, loff_t *offset)
+{
+ int ret = -EINVAL;
+ int result;
+ unsigned char *tmpbuffer;
+
+ if(down_interruptible(&cfag12864b_mutex))
+ return -ERESTARTSYS;
+
+ if (*offset > CFAG12864B_SIZE) {
+ ret = 0;
+ goto none;
+ }
+ if (*offset + count > CFAG12864B_SIZE)
+ count = CFAG12864B_SIZE-*offset;
+
+ tmpbuffer = kmalloc(count, GFP_KERNEL);
+ if (tmpbuffer == NULL) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "FOP write: ERROR: "
+ "can't alloc memory %i bytes\n",count);
+ ret = -ENOMEM;
+ goto none;
+ }
+
+ result = copy_from_user(tmpbuffer, buffer, count);
+ if (result != 0) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "FOP write: ERROR: "
+ "can't copy memory from user\n");
+ ret = -EFAULT;
+ goto bufferalloced;
+ }
+
+ cfag12864b_write_nolock(*offset, tmpbuffer, count);
+
+ *offset += count;
+ ret = count;
+
+bufferalloced:
+ kfree(tmpbuffer);
+
+none:
+ up(&cfag12864b_mutex);
+ return ret;
+}
+
+static int cfag12864b_fopioctl(struct inode * inode, struct file * filp,
+ unsigned int cmd, unsigned long arg)
+{
+ int ret = -ENOTTY;
+
+ if(down_interruptible(&cfag12864b_mutex))
+ return -ERESTARTSYS;
+
+ if (_IOC_TYPE(cmd) != CFAG12864B_IOC_MAGIC)
+ goto none;
+ if (_IOC_NR(cmd) > CFAG12864B_IOC_MAXNR)
+ goto none;
+
+ switch(cmd) {
+ case CFAG12864B_IOCON:
+ cfag12864b_on_nolock();
+ ret = 0;
+ break;
+ case CFAG12864B_IOCOFF:
+ cfag12864b_off_nolock();
+ ret = 0;
+ break;
+ case CFAG12864B_IOCCLEAR:
+ cfag12864b_clear_nolock();
+ ret = 0;
+ break;
+ case CFAG12864B_IOCFORMAT:
+ ret = cfag12864b_fopioctlformat((void __user *)arg);
+ }
+
+none:
+ up(&cfag12864b_mutex);
+ return ret;
+}
+
+static const struct file_operations cfag12864b_fops =
+{
+ .owner = THIS_MODULE,
+ .llseek = cfag12864b_fopseek,
+ .write = cfag12864b_fopwrite,
+ .ioctl = cfag12864b_fopioctl,
+};
+
+/*
+ * Module Init & Exit
+ */
+
+static int __init cfag12864b_init(void)
+{
+
+#include "cfag12864b_image.h"
+
+ int result;
+ int ret = -EINVAL;
+
+ result = alloc_chrdev_region(&cfag12864b_device, cfag12864b_firstminor,
+ cfag12864b_ndevices, CFAG12864B_NAME);
+ if (result < 0) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
+ "can't alloc the char device region\n");
+ ret = result;
+ goto none;
+ }
+
+ cfag12864b_major = MAJOR(cfag12864b_device);
+ cfag12864b_minor = cfag12864b_firstminor;
+ cfag12864b_device = MKDEV(cfag12864b_major, cfag12864b_minor);
+
+ cfag12864b_clear_nolock();
+ cfag12864b_on_nolock();
+ cfag12864b_write_nolock(0, cfag12864b_image, CFAG12864B_SIZE);
+
+ cdev_init(&cfag12864b_chardevice,&cfag12864b_fops);
+ cfag12864b_chardevice.owner = THIS_MODULE;
+ cfag12864b_chardevice.ops = &cfag12864b_fops;
+ result = cdev_add(&cfag12864b_chardevice, cfag12864b_device,
+ cfag12864b_ndevices);
+ if (result < 0) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
+ "unable to add a new char device\n");
+ ret = result;
+ goto regionalloced;
+ }
+
+ if(class_device_create(lcddisplay_class, NULL, cfag12864b_device, NULL,
+ "cfag12864b%d", cfag12864b_minor) == NULL) {
+ printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
+ "unable to create a device class\n");
+ ret = -EINVAL;
+ goto cdevadded;
+ }
+
+ printk(KERN_INFO CFAG12864B_NAME ": " "Inited\n");
+
+ return 0;
+
+cdevadded:
+ cdev_del(&cfag12864b_chardevice);
+
+regionalloced:
+ unregister_chrdev_region(cfag12864b_device, cfag12864b_ndevices);
+
+none:
+ return ret;
+}
+
+static void __exit cfag12864b_exit(void)
+{
+ cfag12864b_off_nolock();
+
+ class_device_destroy(lcddisplay_class, cfag12864b_device);
+ cdev_del(&cfag12864b_chardevice);
+ unregister_chrdev_region(cfag12864b_device, cfag12864b_ndevices);
+
+ printk(KERN_INFO CFAG12864B_NAME ": " "Exited\n");
+}
+
+module_init(cfag12864b_init);
+module_exit(cfag12864b_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
+MODULE_DESCRIPTION("cfag12864b");
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b_image.h linux-2.6.18/drivers/lcddisplay/cfag12864b_image.h
--- linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b_image.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/cfag12864b_image.h 2006-09-28 19:59:11.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * Filename: cfag12864b_image.h
+ * Version: 0.1.0
+ * Description: cfag12864b LCD Display Driver Startup Image
+ * License: GPLv2 or later
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _CFAG12864B_IMAGE_H_
+#define _CFAG12864B_IMAGE_H_
+
+const unsigned char cfag12864b_image[] = {
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0xE0,0xF8,0xFC,0xFE,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xCE,
+0xEE,0xFC,0xFC,0xF8,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0xFF,0x87,0xFB,0x69,0x23,0x3F,0x3F,0x3F,0x07,0x21,0x79,0xF9,0xF1,
+0x83,0xFF,0xFF,0xFF,0xFF,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x06,0x18,0x30,
+0x18,0x06,0xFF,0x00,0x00,0xFD,0x00,0x00,0x78,0xCC,0x84,0xCC,0xFC,0x00,0x00,0x7C,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0xC0,0xFF,0x3D,0x38,0xF0,0xD0,0xD0,0xD0,0xD0,0x48,0x68,0x24,0x14,0x14,
+0x00,0x3F,0xFF,0xF7,0xEF,0xEF,0xFC,0xF0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x01,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xE0,0x30,0xF8,
+0xFE,0x7F,0x03,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x03,0x1F,0x7F,0xFF,0xFF,0xDF,0x3F,0xFE,0xF8,0xF0,0xE0,0x80,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x33,0x21,0x21,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xF0,0xFC,0xFF,0xFF,0xFF,0x07,
+0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x1F,0xFF,0xFF,0xFC,0x03,0xFF,0xFF,0xFF,0xFE,
+0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x7E,0x0F,0x0F,0x0F,0x1B,0x37,0xE7,0xC0,
+0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x10,0xFB,0xFF,0xFD,0xFF,0xFB,0xFF,0x7F,0x3F,
+0x5F,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x08,0x08,0x08,
+0x00,0x1E,0xF2,0x02,0x02,0x02,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+0x07,0x0F,0x3F,0x7E,0xFC,0x38,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x80,0xC0,0xE0,0x00,0xFF,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,
+0x00,0x03,0x0C,0x18,0x10,0x10,0xE0,0x00,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,
+0x00,0x07,0x09,0x08,0x08,0x08,0x10,0x10,0x10,0x10,0x20,0x20,0x20,0x60,0x40,0xC0,
+0xC0,0xC0,0xC0,0x60,0x3F,0x1E,0x11,0x1F,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1F,0x1F,
+0x1F,0x1F,0x1F,0x11,0x3E,0x7F,0xE0,0xE0,0xC0,0xC0,0xC0,0x60,0x30,0x10,0x08,0x0C,
+0x04,0x06,0x02,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x02,0x02,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x80,0x80,0x00,0xFC,0x00,0x00,0x78,0xD4,0x94,0x94,0x58,0x00,0x00,0xFF,0x00,0x00,
+0x00,0x00,0x00,0x3C,0x42,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0xFD,0x00,0x00,0x78,
+0xD4,0x94,0x94,0x58,0x00,0x00,0x78,0xCC,0x84,0xCC,0xFF,0x00,0x00,0x60,0x94,0x94,
+0x54,0xF8,0x00,0x00,0x07,0x00,0x00,0x58,0x94,0x94,0xA4,0x68,0x00,0x00,0x00,0x00,
+0x00,0x00,0xC0,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x40,0x40,0xC0,0x00,0x00,0x00,0x00,0x82,0x41,0x40,0x40,0x80,
+0x00,0x00,0x80,0x40,0x40,0x40,0x80,0x00,0x00,0x00,0x80,0x40,0x40,0x40,0x00,0x00,
+0x00,0x00,0x80,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x01,0x3F,0x01,0x01,0x00,0x18,0x25,0x25,0x15,0x3E,0x00,0x00,0x1E,0xB3,0xA1,
+0xB3,0x7F,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,0x20,0x30,0x28,0x24,0x23,
+0x00,0x00,0x1D,0x22,0x22,0x22,0x1D,0x00,0x00,0x1F,0x22,0x22,0x22,0x1C,0x00,0x0C,
+0x0A,0x09,0x08,0x3F,0x08,0x00,0x00,0x3F,0x33,0x21,0x33,0x1E,0x00,0x00,0x00,0x00,
+0x00,0x00,0xC0,0x20,0x10,0x10,0x10,0x20,0x00,0x00,0xF0,0x10,0x10,0x10,0x20,0xC0,
+0x00,0x00,0x00,0x00,0x00,0xF0,0x10,0x10,0x10,0x20,0xC0,0x00,0x00,0xD0,0x00,0x00,
+0x80,0x40,0x40,0x40,0x80,0x00,0x00,0xC0,0xC0,0x40,0xC0,0x80,0x00,0x00,0xF8,0x00,
+0x00,0x00,0x40,0x40,0x40,0x80,0x00,0xC0,0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,
+0x08,0x00,0x03,0x04,0x08,0x08,0x08,0x04,0x00,0x00,0x0F,0x08,0x08,0x08,0x04,0x03,
+0x00,0x00,0x00,0x00,0x00,0x0F,0x08,0x08,0x08,0x04,0x03,0x00,0x00,0x0F,0x00,0x00,
+0x05,0x09,0x09,0x0A,0x06,0x00,0x00,0x3F,0x0C,0x08,0x0C,0x07,0x00,0x00,0x0F,0x00,
+0x00,0x06,0x09,0x09,0x05,0x0F,0x00,0x20,0x23,0x1C,0x0C,0x03,0x00,0x00,0x00,0x00,
+0x00,0x00,0xF4,0x00,0x00,0xF0,0x00,0x10,0x10,0xE0,0x00,0x00,0xF0,0x00,0x00,0x00,
+0xF0,0x00,0x10,0x20,0xC0,0xC0,0x20,0x10,0x00,0x00,0x00,0x00,0xFC,0x04,0x04,0x04,
+0x08,0xF0,0x00,0x00,0xF0,0x20,0x10,0x10,0x00,0xF4,0x00,0x30,0xC0,0x00,0x00,0xC0,
+0x30,0x00,0xE0,0x50,0x50,0x50,0x60,0x00,0x00,0xF0,0x20,0x10,0x10,0x00,0x00,0x00,
+0x02,0x00,0x03,0x00,0x00,0x03,0x00,0x00,0x00,0x03,0x00,0x00,0x01,0x02,0x02,0x00,
+0x03,0x00,0x02,0x01,0x00,0x00,0x01,0x02,0x00,0x00,0x00,0x00,0x03,0x02,0x02,0x02,
+0x01,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03,0x03,0x00,
+0x00,0x00,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00};
+
+#endif /* _CFAG12864B_IMAGE_H_ */
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/Kconfig linux-2.6.18/drivers/lcddisplay/Kconfig
--- linux-2.6.18-vanilla/drivers/lcddisplay/Kconfig 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/Kconfig 2006-09-30 02:52:24.000000000 +0000
@@ -0,0 +1,110 @@
+#
+# For a description of the syntax of this configuration file,
+# see Documentation/kbuild/kconfig-language.txt.
+#
+# LCD Display drivers configuration.
+#
+# Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+#
+
+menu "LCD Display support"
+
+config LCDDISPLAY
+ tristate "LCD Display support"
+ default n
+ ---help---
+ If you have a LCD display, say Y.
+
+ To compile this as a module, choose M here:
+ module will be called lcddisplay.
+
+ Most LCD drivers use a I/O port (like the parallel port)
+ so you will need to say Y or M at them if you want to see
+ more options in this menu.
+
+ If unsure, say N.
+
+ Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+
+comment "Parallel port dependent:"
+
+config KS0108
+ tristate "KS0108 LCD Controller"
+ depends on LCDDISPLAY && PARPORT
+ default n
+ ---help---
+ If you have a LCD display controlled by one or more KS0108
+ controllers, say Y. You will need also another more specific
+ driver for your LCD.
+
+ Depends on Parallel Port support. If you say Y at
+ parport, you will be able to compile this as a module (M)
+ and built-in as well (Y). If you said M at parport,
+ you will be able only to compile this as a module (M).
+
+ To compile this as a module, choose M here:
+ module will be called ks0108.
+
+ If unsure, say N.
+
+ Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+
+config KS0108_PORT
+ hex "Parallel port where the LCD is connected to"
+ depends on KS0108
+ default 0x378
+ ---help---
+ The address of the parallel port where the LCD is connected to.
+
+ The first standard parallel port address is 0x378.
+ The second standard parallel port address is 0x278.
+ The third standard parallel port address is 0x3BC.
+
+ You can specify a different address if you need.
+
+ If you don't know what I'm talking about, load the parport module,
+ and execute "dmesg". You can see there how many parallel ports
+ where detected and which address everyone has.
+
+ Usually you only need to use 0x378.
+
+ If you compile this as a module, you can still override this
+ using the module parameters.
+
+config KS0108_DELAY
+ int "Delay between each control writing (microseconds)"
+ depends on KS0108
+ default "2"
+ ---help---
+ Amount of time the ks0108 should wait between each control write
+ to the parallel port.
+
+ If your driver seems to miss random writings, increment this.
+
+ If you don't know what I'm talking about, ignore it.
+
+ If you compile this as a module, you can still override this
+ using the module parameters.
+
+config CFAG12864B
+ tristate "CFAG12864B LCD Display"
+ depends on KS0108
+ default n
+ ---help---
+ If you have a Crystalfontz 128x64 2-color LCD display,
+ cfag12864b Series, say Y. You also need the ks0108 LCD
+ Controller driver.
+
+ For help about how to wire your LCD to the parallel port,
+ check this image: http://www.skippari.net/lcd/sekalaista
+ /crystalfontz_cfag12864B-TMI-V.png
+
+ To compile this as a module, choose M here:
+ module will be called cfag12864b.
+
+ If unsure, say N.
+
+ Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+
+endmenu
+
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/ks0108.c linux-2.6.18/drivers/lcddisplay/ks0108.c
--- linux-2.6.18-vanilla/drivers/lcddisplay/ks0108.c 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/ks0108.c 2006-09-30 12:41:31.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ * Filename: ks0108.c
+ * Version: 0.1.0
+ * Description: ks0108 LCD Display Controller Driver
+ * License: GPLv2 or later
+ * Depends: parport
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/delay.h>
+#include <linux/parport.h>
+#include <linux/ks0108.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
+#define KS0108_NAME "ks0108"
+
+/*
+ * Module Parameters
+ */
+
+static unsigned int ks0108_port = CONFIG_KS0108_PORT;
+module_param(ks0108_port, uint, S_IRUGO);
+
+static unsigned int ks0108_delay = CONFIG_KS0108_DELAY;
+module_param(ks0108_delay, uint, S_IRUGO);
+
+/*
+ * Device
+ */
+
+static struct parport *ks0108_parport;
+static struct pardevice *ks0108_pardevice;
+
+/*
+ * ks0108 Exported cmds (don't lock)
+ *
+ * you _should_ lock in the top driver, so
+ * this functions _should not_ get race conditions in any way.
+ * Locking for each byte here would be so slow and useless.
+ */
+
+#define bit(n) (((unsigned char)1)<<(n))
+
+void ks0108_writedata(unsigned char byte)
+{
+ parport_write_data(ks0108_parport, byte);
+}
+
+void ks0108_writecontrol(unsigned char byte)
+{
+ udelay(ks0108_delay);
+ parport_write_control(ks0108_parport, byte ^ (bit(0) | bit(1) | bit(3)));
+}
+
+void ks0108_displaystate(unsigned char state)
+{
+ ks0108_writedata((state ? bit(0) : 0) | bit(1) | bit(2) | bit(3) | bit(4) | bit(5));
+}
+
+void ks0108_startline(unsigned char startline)
+{
+ ks0108_writedata(min(startline,(unsigned char)63) | bit(6) | bit(7));
+}
+
+void ks0108_address(unsigned char address)
+{
+ ks0108_writedata(min(address,(unsigned char)63) | bit(6));
+}
+
+void ks0108_page(unsigned char page)
+{
+ ks0108_writedata(min(page,(unsigned char)7) | bit(3) | bit(4) | bit(5) | bit(7));
+}
+
+EXPORT_SYMBOL_GPL(ks0108_writedata);
+EXPORT_SYMBOL_GPL(ks0108_writecontrol);
+EXPORT_SYMBOL_GPL(ks0108_displaystate);
+EXPORT_SYMBOL_GPL(ks0108_startline);
+EXPORT_SYMBOL_GPL(ks0108_address);
+EXPORT_SYMBOL_GPL(ks0108_page);
+
+/*
+ * Module Init & Exit
+ */
+
+static int __init ks0108_init(void)
+{
+ int result;
+ int ret = -EINVAL;
+
+ ks0108_parport = parport_find_base(ks0108_port);
+ if (ks0108_parport == NULL) {
+ printk(KERN_ERR KS0108_NAME ": " "ERROR: "
+ "parport didn't find %i port\n",ks0108_port);
+ goto none;
+ }
+
+ ks0108_pardevice = parport_register_device(ks0108_parport, KS0108_NAME,
+ NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL);
+ if (ks0108_pardevice == NULL) {
+ printk(KERN_ERR KS0108_NAME ": " "ERROR: "
+ "parport didn't register new device\n");
+ goto none;
+ }
+
+ result = parport_claim(ks0108_pardevice);
+ if (result != 0) {
+ printk(KERN_ERR KS0108_NAME ": " "ERROR: "
+ "can't claim %i parport, maybe in use\n",ks0108_port);
+ ret = result;
+ goto registered;
+ }
+
+ printk(KERN_INFO KS0108_NAME ": " "Inited - ks0108_port=0x%X ks0108_delay=%i\n", ks0108_port, ks0108_delay);
+ return 0;
+
+registered:
+ parport_unregister_device(ks0108_pardevice);
+
+none:
+ return ret;
+}
+
+static void __exit ks0108_exit(void)
+{
+ parport_release(ks0108_pardevice);
+ parport_unregister_device(ks0108_pardevice);
+
+ printk(KERN_INFO KS0108_NAME ": " "Exited\n");
+}
+
+module_init(ks0108_init);
+module_exit(ks0108_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
+MODULE_DESCRIPTION("ks0108");
+
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/lcddisplay.c linux-2.6.18/drivers/lcddisplay/lcddisplay.c
--- linux-2.6.18-vanilla/drivers/lcddisplay/lcddisplay.c 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/lcddisplay.c 2006-09-28 19:59:18.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ * Filename: lcddisplay.c
+ * Version: 0.1.0
+ * Description: LCD Display Class
+ * License: GPLv2 or later
+ * Depends: -
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/lcddisplay.h>
+
+#define LCDDISPLAY_NAME "lcddisplay"
+
+/*
+ * Exported Display Data
+ */
+
+struct class *lcddisplay_class;
+EXPORT_SYMBOL_GPL(lcddisplay_class);
+
+/*
+ * Module Init & Exit
+ */
+
+static int __init lcddisplay_init(void)
+{
+ int ret = -EINVAL;
+
+ lcddisplay_class = class_create(THIS_MODULE, LCDDISPLAY_NAME);
+ if (IS_ERR(lcddisplay_class)) {
+ printk(KERN_ERR LCDDISPLAY_NAME ": " "ERROR: "
+ "can't create %s class\n", LCDDISPLAY_NAME);
+ goto none;
+ }
+
+ printk(KERN_INFO LCDDISPLAY_NAME ": " "Inited\n");
+
+ return 0;
+
+none:
+ return ret;
+}
+
+static void __exit lcddisplay_exit(void)
+{
+ class_destroy(lcddisplay_class);
+
+ printk(KERN_INFO LCDDISPLAY_NAME ": " "Exited\n");
+}
+
+module_init(lcddisplay_init);
+module_exit(lcddisplay_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
+MODULE_DESCRIPTION("lcddisplay");
+
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/Makefile linux-2.6.18/drivers/lcddisplay/Makefile
--- linux-2.6.18-vanilla/drivers/lcddisplay/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/drivers/lcddisplay/Makefile 2006-09-27 19:15:13.000000000 +0000
@@ -0,0 +1,7 @@
+#
+# Makefile for the kernel LCD Display device drivers.
+#
+
+obj-$(CONFIG_LCDDISPLAY) += lcddisplay.o
+obj-$(CONFIG_KS0108) += ks0108.o
+obj-$(CONFIG_CFAG12864B) += cfag12864b.o
diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/Makefile linux-2.6.18/drivers/Makefile
--- linux-2.6.18-vanilla/drivers/Makefile 2006-09-20 03:42:06.000000000 +0000
+++ linux-2.6.18/drivers/Makefile 2006-09-27 19:15:13.000000000 +0000
@@ -76,3 +76,4 @@ obj-$(CONFIG_CRYPTO) += crypto/
obj-$(CONFIG_SUPERH) += sh/
obj-$(CONFIG_GENERIC_TIME) += clocksource/
obj-$(CONFIG_DMA_ENGINE) += dma/
+obj-$(CONFIG_LCDDISPLAY) += lcddisplay/
diff -uprN -X dontdiff linux-2.6.18-vanilla/include/linux/cfag12864b.h linux-2.6.18/include/linux/cfag12864b.h
--- linux-2.6.18-vanilla/include/linux/cfag12864b.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/include/linux/cfag12864b.h 2006-09-28 19:59:57.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Filename: cfag12864b.h
+ * Version: 0.1.0
+ * Description: cfag12864b LCD Display Driver Header
+ * License: GPLv2 or later
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _CFAG12864B_H_
+#define _CFAG12864B_H_
+
+#include <linux/ioctl.h>
+
+#define CFAG12864B_WIDTH 128
+#define CFAG12864B_HEIGHT 64
+#define CFAG12864B_MATRIXSIZE CFAG12864B_WIDTH*CFAG12864B_HEIGHT
+
+#define CFAG12864B_CONTROLLERS 2
+#define CFAG12864B_PAGES 8
+#define CFAG12864B_ADDRESSES 64
+#define CFAG12864B_SIZE CFAG12864B_CONTROLLERS * \
+ CFAG12864B_PAGES * \
+ CFAG12864B_ADDRESSES
+
+#define CFAG12864B_IOC_MAGIC 0xFF
+#define CFAG12864B_IOC_MAXNR 0x03
+
+#define CFAG12864B_IOCOFF _IO(CFAG12864B_IOC_MAGIC,0)
+#define CFAG12864B_IOCON _IO(CFAG12864B_IOC_MAGIC,1)
+#define CFAG12864B_IOCCLEAR _IO(CFAG12864B_IOC_MAGIC,2)
+#define CFAG12864B_IOCFORMAT _IOW(CFAG12864B_IOC_MAGIC,3,void *)
+
+extern void cfag12864b_on(void);
+extern void cfag12864b_off(void);
+extern void cfag12864b_clear(void);
+extern void cfag12864b_write(unsigned short offset,
+ const unsigned char *buffer, unsigned short count);
+extern void cfag12864b_format(unsigned char *src);
+
+#endif /* _CFAG12864B_H_ */
+
diff -uprN -X dontdiff linux-2.6.18-vanilla/include/linux/ks0108.h linux-2.6.18/include/linux/ks0108.h
--- linux-2.6.18-vanilla/include/linux/ks0108.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/include/linux/ks0108.h 2006-09-28 19:59:51.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ * Filename: ks0108.h
+ * Version: 0.1.0
+ * Description: ks0108 LCD Display Controller Driver Header
+ * License: GPLv2 or later
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _KS0108_H_
+#define _KS0108_H_
+
+extern void ks0108_writedata(unsigned char byte);
+extern void ks0108_writecontrol(unsigned char byte);
+extern void ks0108_displaystate(unsigned char state);
+extern void ks0108_startline(unsigned char startline);
+extern void ks0108_address(unsigned char address);
+extern void ks0108_page(unsigned char page);
+
+#endif /* _KS0108_H_ */
diff -uprN -X dontdiff linux-2.6.18-vanilla/include/linux/lcddisplay.h linux-2.6.18/include/linux/lcddisplay.h
--- linux-2.6.18-vanilla/include/linux/lcddisplay.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/include/linux/lcddisplay.h 2006-09-28 19:59:44.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ * Filename: lcddisplay.h
+ * Version: 0.1.0
+ * Description: Display Class Header
+ * License: GPLv2 or later
+ *
+ * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-28
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _LCDDISPLAY_H_
+#define _LCDDISPLAY_H_
+
+#include <linux/device.h>
+
+extern struct class *lcddisplay_class;
+
+#endif /* _LCDDISPLAY_H_ */
+
diff -uprN -X dontdiff linux-2.6.18-vanilla/Documentation/lcddisplay/cfag12864b linux-2.6.18/Documentation/lcddisplay/cfag12864b
--- linux-2.6.18-vanilla/Documentation/lcddisplay/cfag12864b 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/Documentation/lcddisplay/cfag12864b 2006-09-30 12:20:28.000000000 +0000
@@ -0,0 +1,371 @@
+ ===============================
+ cfag12864b Driver Documentation
+ ===============================
+
+License: GPL
+Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+Date: 2006-09-30
+
+
+
+--------
+0. INDEX
+--------
+
+ 1. DEVICE INFORMATION
+ 2. WIRING
+ 3. USER-SPACE PROGRAMMING
+ 3.1. ioctl and a 128*64 boolean matrix
+ 3.2. Direct writing
+ 4. USEFUL FILES
+ 4.1. cfag12864b.h
+ 4.2. bmpwriter.h
+
+
+
+---------------------
+1. DEVICE INFORMATION
+---------------------
+
+Manufacturer: Crystalfontz
+Webpage: http://www.crystalfontz.com
+Device Webpage: http://www.crystalfontz.com/products/12864b/
+Type: LCD Display
+Width: 128
+Height: 64
+Colors: 2
+Controller: ks0108
+Controllers: 2
+Pages: 8 each controller
+Addresses: 64 each page
+
+
+
+---------
+2. WIRING
+---------
+
+The cfag12864b LCD Display Series don't have a official wiring.
+
+The common wiring is done to the parallel port:
+
+http://www.skippari.net/lcd/sekalaista/crystalfontz_cfag12864B-TMI-V.png
+
+You can get help at Crystalfontz and LCDInfo forums.
+
+
+
+-------------------------
+3. USER-SPACE PROGRAMMING
+-------------------------
+
+Include a copy of the provided header:
+
+ #include "cfag12864b.h"
+
+Open the device for writing, /dev/cfag12864b0:
+
+ int fd = open("/dev/cfag12864b0",O_WRONLY);
+
+Then use simple ioctl calls to control it:
+
+ ioctl(fdisplay,CFAG12864B_IOCOFF); /* Turn off (don't clear) */
+ ioctl(fdisplay,CFAG12864B_IOCON); /* Turn on */
+ ioctl(fdisplay,CFAG12864B_IOCCLEAR); /* Clear the display */
+
+For writing to the display, you have two options:
+
+
+3.1. ioctl & 128*64 boolean matrix
+-------------------------------------------------------
+
+This method is easier, but you have to update the entire display
+each time you want to change it.
+
+Note:
+
+ CFAG12864B_FORMATSIZE ==
+ CFAG12864B_WIDTH * CFAG12864B_HEIGHT ==
+ 128 * 64
+
+Declare the matrix and other one:
+
+ unsigned char MyDrawing[CFAG12864B_WIDTH][CFAG12864B_HEIGHT];
+
+ unsigned char Buffer[CFAG12864B_FORMATSIZE];
+
+Copy the 2d matrix to the buffer , like:
+
+ for(i = 0; i < CFAG12864B_WIDTH; i++)
+ for(j = 0; j < CFAG12864B_HEIGHT; j++)
+ Buffer[i + j * CFAG12864B_WIDTH] = MyDrawing[i][j];
+
+Call the ioctl:
+
+ ioctl(fdisplay, CFAG12864B_IOCFORMAT, Buffer);
+
+Voila! Your drawing should appear on the screen.
+
+
+
+3.2. Direct writing
+-------------------
+
+This methods allows you to change each byte of the device,
+so you can achieve a higher update rate updating only the pixels
+you are going to change.
+
+The device size is 1024 == CFAG12864B_SIZE.
+
+You can write and seek the device. The first 512 bytes write to
+the first k0108 controller (left display half) and the last 512 bytes
+write to the second ks0108 controller (right display half).
+
+Each controller is divided into 8 pages. Each page has 64 bytes.
+
+ Controller 0 Controller 1
+ _________________________
+Page 0 |____________|____________|
+Page 1 |____________|____________|
+Page 2 |____________|____________|
+Page 3 |____________|____________|
+Page 4 |____________|____________|
+Page 5 |____________|____________|
+Page 6 |____________|____________|
+Page 7 |____________|____________|
+ <--- 64 --->
+
+You will understand how the device work executing some commands:
+
+ # echo -n A > /dev/cfag12864b0
+ # echo -n a > /dev/cfag12864b0
+ # echo AAAAAA > /dev/cfag12864b0
+ # echo 000000 > /dev/cfag12864b0
+ # echo Hello world! > /dev/cfag12864b0
+ # echo Hello world! Hello world! > /dev/cfag12864b0
+
+After you understand it, code your functions to change specific bytes.
+
+Use write() and lseek() system calls, like:
+
+ lseek(fdisplay, ipage * CFAG12864B_HEIGHT, SEEK_SET);
+ lseek(fdisplay, icontroller * CFAG12864B_SIZE / 2, SEEK_SET);
+
+ write(fdisplay, bufpage, CFAG12864B_HEIGHT);
+ write(fdisplay, bufcontroller, CFAG12864B_SIZE / 2);
+ write(fdisplay, bufdisplay, CFAG12864B_SIZE);
+
+
+---------------
+4. USEFUL FILES
+---------------
+
+
+4.1 cfag12864b.h
+----------------
+
+You can use a copy of this header in your user-space programs.
+
+---
+/*
+ * Filename: cfag12864b.h
+ * Version: 0.1.0
+ * Description: cfag12864b LCD Display Driver Header for user-space apps
+ *
+ * Author: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-12
+ */
+
+#ifndef _CFAG12864B_H_
+#define _CFAG12864B_H_
+
+#include <sys/ioctl.h>
+
+#define CFAG12864B_WIDTH 128
+#define CFAG12864B_HEIGHT 64
+#define CFAG12864B_FORMATSIZE CFAG12864B_WIDTH*CFAG12864B_HEIGHT
+#define CFAG12864B_SIZE 1024
+
+#define CFAG12864B_IOC_MAGIC 0xFF
+
+#define CFAG12864B_IOCOFF _IO(CFAG12864B_IOC_MAGIC,0)
+#define CFAG12864B_IOCON _IO(CFAG12864B_IOC_MAGIC,1)
+#define CFAG12864B_IOCCLEAR _IO(CFAG12864B_IOC_MAGIC,2)
+#define CFAG12864B_IOCFORMAT _IOW(CFAG12864B_IOC_MAGIC,3,void *)
+
+#endif // _CFAG12864B_H_
+---
+
+
+
+4.2 Example BMP writer
+----------------------
+
+You can take ideas from this code and start programming. I think it is useful
+for understanding how the driver can be used. It just work, don't expect
+good BMP-related code. I chose such bitmap format because it is simple.
+
+The program reads a .bmp 128x64 2-colors file, convert it to a
+boolean [128*64] buffer and then use ioctl to display it on the screen.
+
+---
+/*
+ * Filename: bmpwriter.h
+ * Version: 0.1.0
+ * Description: BMP Writer sample app for cfag12864b LCD driver
+ *
+ * Author: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+ * Date: 2006-09-30
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "cfag12864b.h"
+
+#define BMP_SIZE 1024
+
+union dword
+{
+ unsigned int u32;
+ unsigned char u8[4];
+};
+
+#define Bit(n) ((unsigned char)(1<<(n)))
+
+void BMP2Format(
+ unsigned char _Src[BMP_SIZE],
+ unsigned char _Dest[CFAG12864B_FORMATSIZE])
+{
+ const unsigned int Width = CFAG12864B_WIDTH;
+ const unsigned int Height = CFAG12864B_HEIGHT;
+ const unsigned int Bits = 8;
+
+ unsigned int Y,X,Bit;
+
+ for(Y=0; Y<Height; ++Y)
+ for(X=0; X<Width/Bits; ++X)
+ for(Bit=0; Bit<Bits; ++Bit)
+ _Dest[X * Bits + Bit + (Height - Y - 1) * Width] =
+ _Src[Y * Width / Bits + X] & Bit(Bits - Bit - 1) ? 0 : 1;
+}
+
+int main(int argc, char * argv[])
+{
+ const unsigned int Width = CFAG12864B_WIDTH;
+ const unsigned int Height = CFAG12864B_HEIGHT;
+ const unsigned int Size = CFAG12864B_SIZE;
+ const unsigned int BPP = 1;
+ const unsigned int HeaderSize = 0x3E;
+ const unsigned int BMPSize = BMP_SIZE;
+
+ unsigned char c;
+ unsigned int i,j;
+ union dword n;
+
+ unsigned char Buffer_BMP[BMP_SIZE];
+ unsigned char Buffer_Matrix[CFAG12864B_FORMATSIZE];
+
+ int fdisplay;
+ FILE * fbmp;
+
+ // Check args
+ if(argc!=3) {
+ printf("%s: Bad number of arguments. Expected 3\n",
+ argv[0]);
+ return -1;
+ }
+
+ // Open file
+ fbmp = fopen(argv[2],"rb");
+ if(fbmp==NULL) {
+ printf("%s: Can't open %s\n",argv[0], argv[2]);
+ return -2;
+ }
+
+ // Check file size
+ fseek(fbmp,0,SEEK_END);
+ i=ftell(fbmp);
+ if(i!=HeaderSize+Size) {
+ printf("%s: Bad file size. %i instead of %i\n",
+ argv[0], i, HeaderSize+Size);
+ fclose(fbmp);
+ return -3;
+ }
+
+ // Check both magic BMP bytes
+ fseek(fbmp,0,SEEK_SET);
+ c = fgetc(fbmp);
+ if(c!='B') {
+ printf("%s: Bad first magic byte. '%c' instead of 'B'\n",
+ argv[0], c);
+ fclose(fbmp);
+ return -4;
+ }
+ c = fgetc(fbmp);
+ if(c!='M') {
+ printf("%s: Bad second magic byte. '%c' instead of 'M'\n",
+ argv[0], c);
+ fclose(fbmp);
+ return -5;
+ }
+
+ // Check this is a 128x64 1-bpp BMP file
+ fseek(fbmp,0x12,SEEK_SET);
+ for(i=0; i<4; ++i)
+ n.u8[i] = fgetc(fbmp);
+ if(n.u32!=Width) {
+ printf("%s: Bad width. %i instead of %i\n",
+ argv[0], n.u32, Width);
+ fclose(fbmp);
+ return -6;
+ }
+ for(i=0; i<4; ++i)
+ n.u8[i] = fgetc(fbmp);
+ if(n.u32!=Height) {
+ printf("%s: Bad width. %i instead of %i\n",
+ argv[0], n.u32, Height);
+ fclose(fbmp);
+ return -7;
+ }
+ fseek(fbmp,0x1C,SEEK_SET);
+ c = fgetc(fbmp);
+ if(c!=BPP) {
+ printf("%s: Bad bpp. %i instead of %i\n",
+ argv[0], c, BPP);
+ fclose(fbmp);
+ return -8;
+ }
+
+ // Get bitmap data
+ fseek(fbmp,0x3E,SEEK_SET);
+ fread(Buffer_BMP,1,BMPSize,fbmp);
+ fclose(fbmp);
+
+ // Transform BMP data to 2D matrix
+ BMP2Format(Buffer_BMP,Buffer_Matrix);
+
+ // Open file
+ fdisplay = open(argv[1],O_WRONLY);
+ if(fdisplay < 0) {
+ printf("%s: Can't open %s\n", argv[0], argv[1]);
+ return -9;
+ }
+
+ // Send matrix
+ ioctl(fdisplay,CFAG12864B_IOCFORMAT,Buffer_Matrix);
+
+ // Close file
+ close(fdisplay);
+
+ return 0;
+}
+---
+
+
+EOF
diff -uprN -X dontdiff linux-2.6.18-vanilla/Documentation/lcddisplay/lcddisplay linux-2.6.18/Documentation/lcddisplay/lcddisplay
--- linux-2.6.18-vanilla/Documentation/lcddisplay/lcddisplay 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18/Documentation/lcddisplay/lcddisplay 2006-09-30 12:07:59.000000000 +0000
@@ -0,0 +1,37 @@
+ =================================
+ LCD Display Drivers Documentation
+ =================================
+
+License: GPL
+Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
+Date: 2006-09-30
+
+--------
+0. INDEX
+--------
+
+ 1. NEW DISPLAY DRIVERS
+ 2. GENERAL TIPS
+
+
+
+----------------------
+1. NEW DISPLAY DRIVERS
+----------------------
+
+Feel free to send me new display drivers. I will try to do my best.
+
+If you don't get any answer, send your patch directly to the linux-kernel ml.
+
+
+
+---------------
+2. GENERAL TIPS
+---------------
+
+- Divide your driver into the controller driver, like ks0108,
+ and the specific LCD display series driver, like cfag12864b.
+
+- Claim for your IO ports in the controller driver.
+
+EOF
diff -uprN -X dontdiff linux-2.6.18-vanilla/Documentation/ioctl-number.txt linux-2.6.18/Documentation/ioctl-number.txt
--- linux-2.6.18-vanilla/Documentation/ioctl-number.txt 2006-09-20 03:42:06.000000000 +0000
+++ linux-2.6.18/Documentation/ioctl-number.txt 2006-09-27 19:15:13.000000000 +0000
@@ -191,3 +191,5 @@ Code Seq# Include File Comments
<mailto:aherrman@de.ibm.com>
0xF3 00-3F video/sisfb.h sisfb (in development)
<mailto:thomas@winischhofer.net>
+0xFF 00-1F linux/cfag12864b.h cfag12864b LCD Display Driver
+ <mailto:maxextreme@gmail.com>
diff -uprN -X dontdiff linux-2.6.18-vanilla/CREDITS linux-2.6.18/CREDITS
--- linux-2.6.18-vanilla/CREDITS 2006-09-20 03:42:06.000000000 +0000
+++ linux-2.6.18/CREDITS 2006-09-27 19:15:13.000000000 +0000
@@ -2535,6 +2535,14 @@ S: Subiaco, 6008
S: Perth, Western Australia
S: Australia
+N: Miguel Ojeda Sandonis
+E: maxextreme@gmail.com
+D: Author: LCD Display Drivers (ks0108, cfag12864b)
+D: Maintainer: LCD Display Drivers Tree (drivers/lcddisplay/*)
+S: C/ Mieses 20, 9-B
+S: Valladolid 47009
+S: Spain
+
N: Greg Page
E: gpage@sovereign.org
D: IPX development and support
diff -uprN -X dontdiff linux-2.6.18-vanilla/MAINTAINERS linux-2.6.18/MAINTAINERS
--- linux-2.6.18-vanilla/MAINTAINERS 2006-09-20 03:42:06.000000000 +0000
+++ linux-2.6.18/MAINTAINERS 2006-09-27 19:15:13.000000000 +0000
@@ -1707,6 +1707,11 @@ M: James.Bottomley@HansenPartnership.com
L: linux-scsi@vger.kernel.org
S: Maintained
+LCD DISPLAY DRIVERS
+P: Miguel Ojeda Sandonis
+M: maxextreme@gmail.com
+S: Maintained
+
LED SUBSYSTEM
P: Richard Purdie
M: rpurdie@rpsys.net
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 13:22 [PATCH 2.6.18 V6] drivers: add lcd display support Miguel Ojeda Sandonis
2006-09-30 12:39 ` Jan-Benedict Glaw
@ 2006-09-30 19:35 ` Randy Dunlap
2006-09-30 21:36 ` Stefan Richter
1 sibling, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2006-09-30 19:35 UTC (permalink / raw)
To: Miguel Ojeda Sandonis; +Cc: akpm, linux-kernel
On Sat, 30 Sep 2006 13:22:53 +0000 Miguel Ojeda Sandonis wrote:
> Patched files Index
> -------------------
This list should be done with 'diffstat -p1 -w70 patch_file_name'
so that we can see the files and the patch sizes.
> patching file drivers/Kconfig
> patching file drivers/lcddisplay/cfag12864b.c
> patching file drivers/lcddisplay/cfag12864b_image.h
> patching file drivers/lcddisplay/Kconfig
> patching file drivers/lcddisplay/ks0108.c
> patching file drivers/lcddisplay/lcddisplay.c
> patching file drivers/lcddisplay/Makefile
> patching file drivers/Makefile
> patching file include/linux/cfag12864b.h
> patching file include/linux/ks0108.h
> patching file include/linux/lcddisplay.h
> patching file Documentation/lcddisplay/cfag12864b
> patching file Documentation/lcddisplay/lcddisplay
> patching file Documentation/ioctl-number.txt
> patching file CREDITS
> patching file MAINTAINERS
>
> ---
> diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b.c linux-2.6.18/drivers/lcddisplay/cfag12864b.c
> --- linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b.c 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/drivers/lcddisplay/cfag12864b.c 2006-09-30 10:56:32.000000000 +0000
> @@ -0,0 +1,592 @@
> +
> +#define CFAG12864B_NAME "cfag12864b"
> +
> +/*
> + * Device
> + */
> +
> +static const unsigned int cfag12864b_firstminor;
> +static const unsigned int cfag12864b_ndevices = 1;
This driver only supports one device, right?
Is that documented somewhere? I probably missed it.
> +static int cfag12864b_major;
> +static int cfag12864b_minor;
> +static dev_t cfag12864b_device;
> +struct cdev cfag12864b_chardevice;
> +DECLARE_MUTEX(cfag12864b_mutex);
> +
> +/*
> + * cfag12864b Commands
> + */
> +
> +#define bit(n) (((unsigned char)1)<<(n))
> +
> +static unsigned char cfag12864b_state;
> +
> +static void cfag12864b_set(void)
> +{
> + ks0108_writecontrol(cfag12864b_state);
> +}
> +
> +static void cfag12864b_setbit(unsigned char state, unsigned char n)
> +{
> + if (state)
> + cfag12864b_state |= bit(n);
> + else
> + cfag12864b_state &= ~bit(n);
> + cfag12864b_set();
> +}
> +
> +static void cfag12864b_e(unsigned char state)
> +{
> + cfag12864b_setbit(state, 0);
bit defintions? (here and below)
> +}
> +
> +static void cfag12864b_cs1(unsigned char state)
> +{
> + cfag12864b_setbit(state, 2);
> +}
> +
> +static void cfag12864b_cs2(unsigned char state)
> +{
> + cfag12864b_setbit(state, 1);
> +}
> +
> +static void cfag12864b_di(unsigned char state)
> +{
> + cfag12864b_setbit(state, 3);
> +}
> +
> +static void cfag12864b_setcontrollers(unsigned char first, unsigned char second)
> +{
> + if (first)
> + cfag12864b_cs1(0);
> + else
> + cfag12864b_cs1(1);
> +
> + if (second)
> + cfag12864b_cs2(0);
> + else
> + cfag12864b_cs2(1);
> +}
> +
> +static void cfag12864b_controller(unsigned char which)
> +{
> + if (which == 0)
> + cfag12864b_setcontrollers(1, 0);
> + else if (which == 1)
> + cfag12864b_setcontrollers(0, 1);
> +}
> +
> +/*
> + * Auxiliary
> + */
> +
> +static void normalizeoffset(unsigned int * offset)
Kernel style is:
static void normalizeoffset(unsigned int *offset)
> +{
> + if (*offset >= CFAG12864B_PAGES*CFAG12864B_ADDRESSES)
> + *offset -= CFAG12864B_PAGES*CFAG12864B_ADDRESSES;
> +}
> +
> +static unsigned char calcaddress(unsigned int offset)
> +{
> + normalizeoffset(&offset);
> + return offset%CFAG12864B_ADDRESSES;
spaces around '%'
> +}
> +
> +static unsigned char calccontroller(unsigned int offset)
> +{
> + if (offset < CFAG12864B_PAGES*CFAG12864B_ADDRESSES)
> + return 0;
> + return 1;
> +}
> +
> +static unsigned char calcpage(unsigned int offset)
> +{
> + normalizeoffset(&offset);
> + return offset/CFAG12864B_ADDRESSES;
spaces around '/'
> +}
> +
> +void cfag12864b_format_nolock(unsigned char *src)
> +{
> + unsigned short i,j,k,n;
spaces after commas
> + unsigned char *dest;
> +
> + dest = kmalloc(sizeof(unsigned char) * CFAG12864B_SIZE, GFP_KERNEL);
Are there places where sizeof(unsigned char) is not 1?
> + if (dest == NULL) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "format: ERROR: "
> + "can't alloc memory %i bytes\n",
use "%zd" to print sizeof() values, otherwise gcc says:
drivers/lcddisplay/cfag12864b.c:271: warning: format '%i' expects type 'int', but argument 2 has type 'long unsigned int'
> + sizeof(unsigned char) * CFAG12864B_SIZE);
> + return;
> + }
> +
> + for (i = 0; i < CFAG12864B_CONTROLLERS; i++)
> + for (j = 0; j < CFAG12864B_PAGES; j++)
> + for (k = 0; k < CFAG12864B_ADDRESSES; k++) {
questionable indentation
> + dest[(i * CFAG12864B_PAGES + j) * CFAG12864B_ADDRESSES + k] = 0;
> + for (n=0; n < 8; n++)
spaces around '='
> + if (src[i * CFAG12864B_ADDRESSES + k + (j * 8 + n) * CFAG12864B_WIDTH])
> + dest[(i * CFAG12864B_PAGES + j) * CFAG12864B_ADDRESSES + k] |= bit(n);
> + }
> +
> + cfag12864b_write_nolock(0, dest, CFAG12864B_SIZE);
> +
> + kfree(dest);
> +}
> +
> +/*
> + * cfag12864b Exported Commands (do lock)
> + */
> +
> +void cfag12864b_on(void)
> +{
> + if(down_interruptible(&cfag12864b_mutex))
space after "if"
> + return;
> +
> + cfag12864b_on_nolock();
> +
> + up(&cfag12864b_mutex);
> +}
> +
> +void cfag12864b_off(void)
> +{
> + if(down_interruptible(&cfag12864b_mutex))
space after "if"
> + return;
> +
> + cfag12864b_off_nolock();
> +
> + up(&cfag12864b_mutex);
> +}
> +
> +void cfag12864b_clear(void)
> +{
> + if(down_interruptible(&cfag12864b_mutex))
ditto
> + return;
> +
> + cfag12864b_clear_nolock();
> +
> + up(&cfag12864b_mutex);
> +}
> +
> +void cfag12864b_write(unsigned short offset, const unsigned char *buffer,
> + unsigned short count)
> +{
> + if(down_interruptible(&cfag12864b_mutex))
ditto
> + return;
> +
> + cfag12864b_write_nolock(offset,buffer,count);
> +
> + up(&cfag12864b_mutex);
> +}
> +
> +void cfag12864b_format(unsigned char *src)
> +{
> + if(down_interruptible(&cfag12864b_mutex))
ditto
> + return;
> +
> + cfag12864b_format_nolock(src);
> +
> + up(&cfag12864b_mutex);
> +}
> +
> +EXPORT_SYMBOL_GPL(cfag12864b_on);
> +EXPORT_SYMBOL_GPL(cfag12864b_off);
> +EXPORT_SYMBOL_GPL(cfag12864b_clear);
> +EXPORT_SYMBOL_GPL(cfag12864b_write);
> +EXPORT_SYMBOL_GPL(cfag12864b_format);
> +
> +/*
> + * cfag12864b ioctls (don't lock because ioctl fop do)
> + */
> +
> +static int cfag12864b_fopioctlformat(void __user * arg)
use "*arg" without space
> +{
> + int result;
> + int ret = -ENOTTY;
> + unsigned char *tmpbuffer;
> +
> + tmpbuffer = kmalloc(
> + sizeof(unsigned char)*CFAG12864B_MATRIXSIZE,GFP_KERNEL);
spacebar helps readability. add spaces around * and after comma.
> + if (tmpbuffer == NULL) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "FOP ioctl: ERROR: "
> + "can't alloc memory %i bytes\n",
use "%zd" to print sizeof() values, otherwise gcc complains.
> + sizeof(unsigned char)*CFAG12864B_MATRIXSIZE);
space around '*'
> + goto none;
> + }
> +
> + result = copy_from_user(tmpbuffer, arg,
> + sizeof(unsigned char) * CFAG12864B_MATRIXSIZE);
> + if (result != 0) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "FOP ioctl: ERROR: "
> + "can't copy memory from user\n");
I don't think that we want a printk on every copy_from_user() error.
(here and elsewhere)
> + goto bufferalloced;
> + }
> +
> + cfag12864b_format_nolock(tmpbuffer);
> +
> + ret = 0;
> +
> +bufferalloced:
> + kfree(tmpbuffer);
> +
> +none:
> + return ret;
> +}
> +
> +/*
> + * cfag12864b_fops (do lock)
> + */
> +
> +static loff_t cfag12864b_fopseek(struct file *filp, loff_t offset, int whence)
> +{
> + loff_t ret = -EINVAL;
> +
> + if(down_interruptible(&cfag12864b_mutex))
space after "if"
> + return -ERESTARTSYS;
> +
> + switch(whence) {
> + case SEEK_SET:
> + ret = offset;
> + break;
> + case SEEK_CUR:
> + ret = filp->f_pos + offset;
> + break;
> + case SEEK_END:
> + ret = CFAG12864B_SIZE + offset;
> + break;
> + }
> +
> + if (ret < 0) {
> + ret = -EINVAL;
> + goto none;
> + }
> +
> + filp->f_pos = ret;
> +
> +none:
> + up(&cfag12864b_mutex);
> + return ret;
> +}
> +
> +
> +static ssize_t cfag12864b_fopwrite(struct file *filp,
> + const char __user *buffer, size_t count, loff_t *offset)
> +{
> + int ret = -EINVAL;
> + int result;
> + unsigned char *tmpbuffer;
> +
> + if(down_interruptible(&cfag12864b_mutex))
space
> + return -ERESTARTSYS;
> +
> + if (*offset > CFAG12864B_SIZE) {
> + ret = 0;
> + goto none;
> + }
> + if (*offset + count > CFAG12864B_SIZE)
> + count = CFAG12864B_SIZE-*offset;
> +
> + tmpbuffer = kmalloc(count, GFP_KERNEL);
I would be very tempted to allocate a buffer at (open or init?) time,
of size CFAG12864B_SIZE. It could be used here for fopwrite and
in format_nolock without having to call kmalloc() repeatedly
for those operations. However, fopioctlformat would still need
to allocate its larger buffer.
> + if (tmpbuffer == NULL) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "FOP write: ERROR: "
> + "can't alloc memory %i bytes\n",count);
use "%zd" to print sizeof values, otherwise gcc complains.
use space after comma.
> + ret = -ENOMEM;
> + goto none;
> + }
> +
> + result = copy_from_user(tmpbuffer, buffer, count);
> + if (result != 0) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "FOP write: ERROR: "
> + "can't copy memory from user\n");
> + ret = -EFAULT;
> + goto bufferalloced;
> + }
> +
> + cfag12864b_write_nolock(*offset, tmpbuffer, count);
> +
> + *offset += count;
> + ret = count;
> +
> +bufferalloced:
> + kfree(tmpbuffer);
> +
> +none:
> + up(&cfag12864b_mutex);
> + return ret;
> +}
> +
> +static int cfag12864b_fopioctl(struct inode * inode, struct file * filp,
> + unsigned int cmd, unsigned long arg)
> +{
> + int ret = -ENOTTY;
> +
> + if(down_interruptible(&cfag12864b_mutex))
space after "if"
> + return -ERESTARTSYS;
> +
> + if (_IOC_TYPE(cmd) != CFAG12864B_IOC_MAGIC)
> + goto none;
> + if (_IOC_NR(cmd) > CFAG12864B_IOC_MAXNR)
> + goto none;
> +
> + switch(cmd) {
> + case CFAG12864B_IOCON:
> + cfag12864b_on_nolock();
> + ret = 0;
> + break;
> + case CFAG12864B_IOCOFF:
> + cfag12864b_off_nolock();
> + ret = 0;
> + break;
> + case CFAG12864B_IOCCLEAR:
> + cfag12864b_clear_nolock();
> + ret = 0;
> + break;
> + case CFAG12864B_IOCFORMAT:
> + ret = cfag12864b_fopioctlformat((void __user *)arg);
> + }
> +
> +none:
> + up(&cfag12864b_mutex);
> + return ret;
> +}
> +
> +static const struct file_operations cfag12864b_fops =
> +{
> + .owner = THIS_MODULE,
> + .llseek = cfag12864b_fopseek,
> + .write = cfag12864b_fopwrite,
> + .ioctl = cfag12864b_fopioctl,
> +};
> +
> +/*
> + * Module Init & Exit
> + */
> +
> +static int __init cfag12864b_init(void)
> +{
> +
> +#include "cfag12864b_image.h"
> +
> + int result;
> + int ret = -EINVAL;
> +
> + result = alloc_chrdev_region(&cfag12864b_device, cfag12864b_firstminor,
> + cfag12864b_ndevices, CFAG12864B_NAME);
> + if (result < 0) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
> + "can't alloc the char device region\n");
> + ret = result;
> + goto none;
> + }
> +
> + cfag12864b_major = MAJOR(cfag12864b_device);
> + cfag12864b_minor = cfag12864b_firstminor;
> + cfag12864b_device = MKDEV(cfag12864b_major, cfag12864b_minor);
> +
> + cfag12864b_clear_nolock();
> + cfag12864b_on_nolock();
> + cfag12864b_write_nolock(0, cfag12864b_image, CFAG12864B_SIZE);
> +
> + cdev_init(&cfag12864b_chardevice,&cfag12864b_fops);
> + cfag12864b_chardevice.owner = THIS_MODULE;
> + cfag12864b_chardevice.ops = &cfag12864b_fops;
> + result = cdev_add(&cfag12864b_chardevice, cfag12864b_device,
> + cfag12864b_ndevices);
> + if (result < 0) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
> + "unable to add a new char device\n");
> + ret = result;
> + goto regionalloced;
> + }
> +
> + if(class_device_create(lcddisplay_class, NULL, cfag12864b_device, NULL,
space after "if"
> + "cfag12864b%d", cfag12864b_minor) == NULL) {
> + printk(KERN_ERR CFAG12864B_NAME ": " "ERROR: "
> + "unable to create a device class\n");
> + ret = -EINVAL;
> + goto cdevadded;
> + }
> +
> + printk(KERN_INFO CFAG12864B_NAME ": " "Inited\n");
KERN_DEBUG ?
> +
> + return 0;
> +
> +cdevadded:
> + cdev_del(&cfag12864b_chardevice);
> +
> +regionalloced:
> + unregister_chrdev_region(cfag12864b_device, cfag12864b_ndevices);
> +
> +none:
> + return ret;
> +}
> +
> +static void __exit cfag12864b_exit(void)
> +{
> + cfag12864b_off_nolock();
> +
> + class_device_destroy(lcddisplay_class, cfag12864b_device);
> + cdev_del(&cfag12864b_chardevice);
> + unregister_chrdev_region(cfag12864b_device, cfag12864b_ndevices);
> +
> + printk(KERN_INFO CFAG12864B_NAME ": " "Exited\n");
KERN_DEBUG ?
> +}
> +
> +module_init(cfag12864b_init);
> +module_exit(cfag12864b_exit);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
> +MODULE_DESCRIPTION("cfag12864b");
That's not a useful MODULE_DESCRIPTION.
> diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b_image.h linux-2.6.18/drivers/lcddisplay/cfag12864b_image.h
> --- linux-2.6.18-vanilla/drivers/lcddisplay/cfag12864b_image.h 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/drivers/lcddisplay/cfag12864b_image.h 2006-09-28 19:59:11.000000000 +0000
> @@ -0,0 +1,95 @@
> +#ifndef _CFAG12864B_IMAGE_H_
> +#define _CFAG12864B_IMAGE_H_
> +
> +const unsigned char cfag12864b_image[] = {
What is in this image array? and what format is it in?
It's not just advertising/logo material, is it?
Is it really needed in cfag12864b_init()?
[bits deleted]
> diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/Kconfig linux-2.6.18/drivers/lcddisplay/Kconfig
> --- linux-2.6.18-vanilla/drivers/lcddisplay/Kconfig 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/drivers/lcddisplay/Kconfig 2006-09-30 02:52:24.000000000 +0000
> @@ -0,0 +1,110 @@
> +#
> +# For a description of the syntax of this configuration file,
> +# see Documentation/kbuild/kconfig-language.txt.
> +#
> +# LCD Display drivers configuration.
> +#
> +# Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
> +#
Don't need any of those comments above.
> +menu "LCD Display support"
> +
> +config LCDDISPLAY
> + tristate "LCD Display support"
> + default n
> + ---help---
> + If you have a LCD display, say Y.
> +
> + To compile this as a module, choose M here:
> + module will be called lcddisplay.
"the module will be..."
> + Most LCD drivers use a I/O port (like the parallel port)
use an I/O port
> + so you will need to say Y or M at them if you want to see
say Y or M for them
> + more options in this menu.
> +
> + If unsure, say N.
> +
> + Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
Just in the MAINTAINERS file.
> +comment "Parallel port dependent:"
> +
> +config KS0108
> + tristate "KS0108 LCD Controller"
> + depends on LCDDISPLAY && PARPORT
> + default n
> + ---help---
> + If you have a LCD display controlled by one or more KS0108
have an LCD display
> + controllers, say Y. You will need also another more specific
> + driver for your LCD.
> +
> + Depends on Parallel Port support. If you say Y at
> + parport, you will be able to compile this as a module (M)
> + and built-in as well (Y). If you said M at parport,
s/and/or/
> + you will be able only to compile this as a module (M).
However, that is true everywhere, so we usually don't say it.
> + To compile this as a module, choose M here:
> + module will be called ks0108.
"the module will be..."
> + If unsure, say N.
> +
> + Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
Just in MAINTAINERS file.
> +config KS0108_PORT
> + hex "Parallel port where the LCD is connected to"
...where the LCD is connected"
> + depends on KS0108
> + default 0x378
> + ---help---
> + The address of the parallel port where the LCD is connected to.
... where the LCD is connected.
> + The first standard parallel port address is 0x378.
> + The second standard parallel port address is 0x278.
> + The third standard parallel port address is 0x3BC.
> +
> + You can specify a different address if you need.
> +
> + If you don't know what I'm talking about, load the parport module,
> + and execute "dmesg". You can see there how many parallel ports
comma after "parallel ports"
> + where detected and which address everyone has.
add comma, change wording, like: "where they are connected,"
"and which address each one has."
> + Usually you only need to use 0x378.
> +
> + If you compile this as a module, you can still override this
> + using the module parameters.
> +
> +config KS0108_DELAY
> + int "Delay between each control writing (microseconds)"
> + depends on KS0108
> + default "2"
> + ---help---
> + Amount of time the ks0108 should wait between each control write
> + to the parallel port.
> +
> + If your driver seems to miss random writings, increment this.
> +
> + If you don't know what I'm talking about, ignore it.
> +
> + If you compile this as a module, you can still override this
> + using the module parameters.
> +
> +config CFAG12864B
> + tristate "CFAG12864B LCD Display"
> + depends on KS0108
> + default n
> + ---help---
> + If you have a Crystalfontz 128x64 2-color LCD display,
> + cfag12864b Series, say Y. You also need the ks0108 LCD
> + Controller driver.
> +
> + For help about how to wire your LCD to the parallel port,
> + check this image: http://www.skippari.net/lcd/sekalaista
> + /crystalfontz_cfag12864B-TMI-V.png
check this image: <newline and put URL all on one line>
> + To compile this as a module, choose M here:
> + module will be called cfag12864b.
"the module will be..."
> + If unsure, say N.
> +
> + Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
Only in MAINTAINERS file.
> +endmenu
> +
> diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/ks0108.c linux-2.6.18/drivers/lcddisplay/ks0108.c
> --- linux-2.6.18-vanilla/drivers/lcddisplay/ks0108.c 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/drivers/lcddisplay/ks0108.c 2006-09-30 12:41:31.000000000 +0000
> @@ -0,0 +1,160 @@
> +/*
> + * ks0108 Exported cmds (don't lock)
> + *
> + * you _should_ lock in the top driver, so
> + * this functions _should not_ get race conditions in any way.
these functions
> + * Locking for each byte here would be so slow and useless.
> + */
> +
> +#define bit(n) (((unsigned char)1)<<(n))
> +
> +void ks0108_writecontrol(unsigned char byte)
> +{
> + udelay(ks0108_delay);
> + parport_write_control(ks0108_parport, byte ^ (bit(0) | bit(1) | bit(3)));
what does the xor do? what are the bits?
> +}
> +
> +void ks0108_displaystate(unsigned char state)
> +{
> + ks0108_writedata((state ? bit(0) : 0) | bit(1) | bit(2) | bit(3) | bit(4) | bit(5));
Are the state bits documented somewhere?
Can you use meaningful mnemonic names for the bits?
> +}
> +
> +void ks0108_startline(unsigned char startline)
> +{
> + ks0108_writedata(min(startline,(unsigned char)63) | bit(6) | bit(7));
bit definitions?
> +}
> +
> +void ks0108_address(unsigned char address)
> +{
> + ks0108_writedata(min(address,(unsigned char)63) | bit(6));
bit definition?
> +}
> +
> +void ks0108_page(unsigned char page)
> +{
> + ks0108_writedata(min(page,(unsigned char)7) | bit(3) | bit(4) | bit(5) | bit(7));
bit definitions?
> +}
> +
> +static int __init ks0108_init(void)
> +{
> + int result;
> + int ret = -EINVAL;
> +
> + ks0108_parport = parport_find_base(ks0108_port);
> + if (ks0108_parport == NULL) {
> + printk(KERN_ERR KS0108_NAME ": " "ERROR: "
merge strings together, like:
printk(KERN_ERR KS0108_NAME ": ERROR: "
(throughout the source files)
> + "parport didn't find %i port\n",ks0108_port);
space after ","
> + goto none;
> + }
> +
> + ks0108_pardevice = parport_register_device(ks0108_parport, KS0108_NAME,
> + NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL);
> + if (ks0108_pardevice == NULL) {
> + printk(KERN_ERR KS0108_NAME ": " "ERROR: "
> + "parport didn't register new device\n");
> + goto none;
> + }
> +
> + result = parport_claim(ks0108_pardevice);
> + if (result != 0) {
> + printk(KERN_ERR KS0108_NAME ": " "ERROR: "
> + "can't claim %i parport, maybe in use\n",ks0108_port);
space after comma
> + ret = result;
> + goto registered;
> + }
> +
> + printk(KERN_INFO KS0108_NAME ": " "Inited - ks0108_port=0x%X ks0108_delay=%i\n", ks0108_port, ks0108_delay);
> + return 0;
> +
> +registered:
> + parport_unregister_device(ks0108_pardevice);
> +
> +none:
> + return ret;
> +}
> +
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
> +MODULE_DESCRIPTION("ks0108");
Use a real MODULE_DESCRIPTION, please.
> diff -uprN -X dontdiff linux-2.6.18-vanilla/drivers/lcddisplay/lcddisplay.c linux-2.6.18/drivers/lcddisplay/lcddisplay.c
> --- linux-2.6.18-vanilla/drivers/lcddisplay/lcddisplay.c 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/drivers/lcddisplay/lcddisplay.c 2006-09-28 19:59:18.000000000 +0000
> @@ -0,0 +1,79 @@
> +
> +static int __init lcddisplay_init(void)
> +{
> + int ret = -EINVAL;
> +
> + lcddisplay_class = class_create(THIS_MODULE, LCDDISPLAY_NAME);
> + if (IS_ERR(lcddisplay_class)) {
> + printk(KERN_ERR LCDDISPLAY_NAME ": " "ERROR: "
The multiple quotation marks is a bit odd & difficult to read.
How about just doing:
printk(KERN_ERR LCDDISPLAY_NAME ": ERROR: "
(in MANY places)?
> + "can't create %s class\n", LCDDISPLAY_NAME);
> + goto none;
> + }
> +
> + printk(KERN_INFO LCDDISPLAY_NAME ": " "Inited\n");
printk(KERN_INFO LCDDISPLAY_NAME ": Inited\n");
or better yet,
printk(KERN_DEBUG LCDDISPLAY_NAME ": Inited\n");
> + return 0;
> +
> +none:
> + return ret;
> +}
> +
> +static void __exit lcddisplay_exit(void)
> +{
> + class_destroy(lcddisplay_class);
> +
> + printk(KERN_INFO LCDDISPLAY_NAME ": " "Exited\n");
KERN_DEBUG & merge the strings?
> +}
> +
> +module_init(lcddisplay_init);
> +module_exit(lcddisplay_exit);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>");
> +MODULE_DESCRIPTION("lcddisplay");
Not a useful MODULE_DESCRIPTION.
> diff -uprN -X dontdiff linux-2.6.18-vanilla/include/linux/cfag12864b.h linux-2.6.18/include/linux/cfag12864b.h
> --- linux-2.6.18-vanilla/include/linux/cfag12864b.h 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/include/linux/cfag12864b.h 2006-09-28 19:59:57.000000000 +0000
> @@ -0,0 +1,58 @@
> +
> +#ifndef _CFAG12864B_H_
> +#define _CFAG12864B_H_
> +
> +#include <linux/ioctl.h>
> +
> +#define CFAG12864B_WIDTH 128
> +#define CFAG12864B_HEIGHT 64
> +#define CFAG12864B_MATRIXSIZE CFAG12864B_WIDTH*CFAG12864B_HEIGHT
Use parens around defined expressions (above).
> +#define CFAG12864B_CONTROLLERS 2
> +#define CFAG12864B_PAGES 8
> +#define CFAG12864B_ADDRESSES 64
> +#define CFAG12864B_SIZE CFAG12864B_CONTROLLERS * \
> + CFAG12864B_PAGES * \
> + CFAG12864B_ADDRESSES
use parens.
> +#define CFAG12864B_IOC_MAGIC 0xFF
> +#define CFAG12864B_IOC_MAXNR 0x03
> +
> +#define CFAG12864B_IOCOFF _IO(CFAG12864B_IOC_MAGIC,0)
> +#define CFAG12864B_IOCON _IO(CFAG12864B_IOC_MAGIC,1)
> +#define CFAG12864B_IOCCLEAR _IO(CFAG12864B_IOC_MAGIC,2)
> +#define CFAG12864B_IOCFORMAT _IOW(CFAG12864B_IOC_MAGIC,3,void *)
> +
> +extern void cfag12864b_on(void);
> +extern void cfag12864b_off(void);
> +extern void cfag12864b_clear(void);
> +extern void cfag12864b_write(unsigned short offset,
> + const unsigned char *buffer, unsigned short count);
> +extern void cfag12864b_format(unsigned char *src);
All function prototypes that have parameters (above):
kernel style is to use type + param_name, not just type.
> +#endif /* _CFAG12864B_H_ */
> +
> diff -uprN -X dontdiff linux-2.6.18-vanilla/Documentation/lcddisplay/cfag12864b linux-2.6.18/Documentation/lcddisplay/cfag12864b
> --- linux-2.6.18-vanilla/Documentation/lcddisplay/cfag12864b 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.18/Documentation/lcddisplay/cfag12864b 2006-09-30 12:20:28.000000000 +0000
> @@ -0,0 +1,371 @@
> +
> +---------
> +2. WIRING
> +---------
> +
> +The cfag12864b LCD Display Series don't have a official wiring.
... don't have official wiring.
> +The common wiring is done to the parallel port:
> +
> +http://www.skippari.net/lcd/sekalaista/crystalfontz_cfag12864B-TMI-V.png
> +
> +You can get help at Crystalfontz and LCDInfo forums.
> +
> +
> +3.1. ioctl & 128*64 boolean matrix
> +-------------------------------------------------------
> +
> +This method is easier, but you have to update the entire display
> +each time you want to change it.
> +
> +Note:
> +
> + CFAG12864B_FORMATSIZE ==
> + CFAG12864B_WIDTH * CFAG12864B_HEIGHT ==
> + 128 * 64
> +
> +Declare the matrix and other one:
other one what? another matrix buffer?
> + unsigned char MyDrawing[CFAG12864B_WIDTH][CFAG12864B_HEIGHT];
> +
> + unsigned char Buffer[CFAG12864B_FORMATSIZE];
> +
> +Copy the 2d matrix to the buffer , like:
to the buffer,
> +
> + for(i = 0; i < CFAG12864B_WIDTH; i++)
> + for(j = 0; j < CFAG12864B_HEIGHT; j++)
> + Buffer[i + j * CFAG12864B_WIDTH] = MyDrawing[i][j];
> +
> +Call the ioctl:
> +
> + ioctl(fdisplay, CFAG12864B_IOCFORMAT, Buffer);
> +
> +Voila! Your drawing should appear on the screen.
> +
> +
> +
> +3.2. Direct writing
> +-------------------
> +
> +This methods allows you to change each byte of the device,
This method
> +so you can achieve a higher update rate updating only the pixels
> +you are going to change.
> +4.2 Example BMP writer
> +----------------------
> +
> +You can take ideas from this code and start programming. I think it is useful
> +for understanding how the driver can be used. It just work, don't expect
just works;
> +good BMP-related code. I chose such bitmap format because it is simple.
> +
> +The program reads a .bmp 128x64 2-colors file, convert it to a
"converts it to a"
> +boolean [128*64] buffer and then use ioctl to display it on the screen.
"then uses"
> diff -uprN -X dontdiff linux-2.6.18-vanilla/Documentation/ioctl-number.txt linux-2.6.18/Documentation/ioctl-number.txt
> --- linux-2.6.18-vanilla/Documentation/ioctl-number.txt 2006-09-20 03:42:06.000000000 +0000
> +++ linux-2.6.18/Documentation/ioctl-number.txt 2006-09-27 19:15:13.000000000 +0000
> @@ -191,3 +191,5 @@ Code Seq# Include File Comments
> <mailto:aherrman@de.ibm.com>
> 0xF3 00-3F video/sisfb.h sisfb (in development)
> <mailto:thomas@winischhofer.net>
> +0xFF 00-1F linux/cfag12864b.h cfag12864b LCD Display Driver
> + <mailto:maxextreme@gmail.com>
Also need additions to Documenation/ABI/ ?
Please read/check Documentation/ABI/README.
and please read/check Documentation/SubmitChecklist.
> diff -uprN -X dontdiff linux-2.6.18-vanilla/MAINTAINERS linux-2.6.18/MAINTAINERS
> --- linux-2.6.18-vanilla/MAINTAINERS 2006-09-20 03:42:06.000000000 +0000
> +++ linux-2.6.18/MAINTAINERS 2006-09-27 19:15:13.000000000 +0000
> @@ -1707,6 +1707,11 @@ M: James.Bottomley@HansenPartnership.com
> L: linux-scsi@vger.kernel.org
> S: Maintained
>
> +LCD DISPLAY DRIVERS
> +P: Miguel Ojeda Sandonis
> +M: maxextreme@gmail.com
> +S: Maintained
> +
Needs a mailing list (L:) entry.
---
~Randy
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 12:39 ` Jan-Benedict Glaw
@ 2006-09-30 20:10 ` Miguel Ojeda
0 siblings, 0 replies; 12+ messages in thread
From: Miguel Ojeda @ 2006-09-30 20:10 UTC (permalink / raw)
To: Miguel Ojeda Sandonis, akpm, linux-kernel
On 9/30/06, Jan-Benedict Glaw <jbglaw@lug-owl.de> wrote:
>
> AFAIK, the 'D' in LCD is already an abbreviation for "display", so
> could we name it lcdisplay or something like that?
>
My first guess was "lcd" ("d" as display), but there were already
devices with such name. So I chose "display", as they are additional
small displays (LCD or not). However, people thought it was a very
common name. Then I chose "LCD Display". Such name is more expressive
(it is "a Display, LCD type") and doesn't makes trouble with new lcd
screens, or the "lcd" drivers, or...
I don't care really about the name with or without "double d". Can
someone else give his/her opinion about this?
Thank you,
Miguel Ojeda
> MfG, JBG
>
> --
> Jan-Benedict Glaw jbglaw@lug-owl.de +49-172-7608481
> Signature of: The real problem with C++ for kernel modules is: the language just sucks.
> the second : -- Linus Torvalds
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.1 (GNU/Linux)
>
> iD8DBQFFHmWAHb1edYOZ4bsRAkdpAJ4g9+GPFYU4Y5W7JdGZXFDCmBDIggCfe6dk
> 3FbG+mcZQ+10MNkq5wC9J7w=
> =KzkJ
> -----END PGP SIGNATURE-----
>
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 19:35 ` Randy Dunlap
@ 2006-09-30 21:36 ` Stefan Richter
2006-09-30 21:48 ` Randy Dunlap
0 siblings, 1 reply; 12+ messages in thread
From: Stefan Richter @ 2006-09-30 21:36 UTC (permalink / raw)
To: Miguel Ojeda Sandonis; +Cc: Randy Dunlap, akpm, linux-kernel
...
>> patching file drivers/lcddisplay/cfag12864b.c
...
What does the D in LCD stand for? I suggest this is named
drivers/lcdisplay/ instead.
--
Stefan Richter
-=====-=-==- =--= ====-
http://arcgraph.de/sr/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 21:36 ` Stefan Richter
@ 2006-09-30 21:48 ` Randy Dunlap
2006-09-30 22:45 ` Miguel Ojeda
0 siblings, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2006-09-30 21:48 UTC (permalink / raw)
To: Stefan Richter; +Cc: Miguel Ojeda Sandonis, akpm, linux-kernel
On Sat, 30 Sep 2006 23:36:44 +0200 Stefan Richter wrote:
> ...
> >> patching file drivers/lcddisplay/cfag12864b.c
> ...
>
> What does the D in LCD stand for? I suggest this is named
> drivers/lcdisplay/ instead.
Yes, someone else mentioned that too.
It does mean Display.
not a big deal to me in this age of acronyms.
---
~Randy
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 21:48 ` Randy Dunlap
@ 2006-09-30 22:45 ` Miguel Ojeda
2006-09-30 22:52 ` Randy Dunlap
0 siblings, 1 reply; 12+ messages in thread
From: Miguel Ojeda @ 2006-09-30 22:45 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stefan Richter, akpm, linux-kernel
Randy, I'm testing right now the V7 of the driver after fixing all
your mistakes found. Thank you for your deep work: the sharing of the
buffer was a very good point. Finally I allocated both 2 (the bigger
and the smaller one at the initialization).
In a few minutes I will send the V7 patch.
About "lcdisplay":
On 9/30/06, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On Sat, 30 Sep 2006 23:36:44 +0200 Stefan Richter wrote:
>
> > ...
> > >> patching file drivers/lcddisplay/cfag12864b.c
> > ...
> >
> > What does the D in LCD stand for? I suggest this is named
> > drivers/lcdisplay/ instead.
>
> Yes, someone else mentioned that too.
> It does mean Display.
> not a big deal to me in this age of acronyms.
>
Well, I can rename it, but there is a problem:
How should I write the name in other places?
I mean, for example, in Kconfig:
tristate "KS0108 LCD Controller"
if the ks0108 is a LCD controller, then
tristate "CFAG12864B LCD Display"
should be the right way to write it?
tristate "CFAG12864B LCDisplay"
seems so ugly to me. Is it? Remember, this applies for all the other
places in the documentation / source code / ...
IMHO it seems better as LCD Display. Yeah, drivers/lcdisplay/ would be
nice, but I don't think the same about other places:
LCD Controller.
LCDisplay??
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 22:45 ` Miguel Ojeda
@ 2006-09-30 22:52 ` Randy Dunlap
2006-10-01 8:20 ` Stefan Richter
0 siblings, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2006-09-30 22:52 UTC (permalink / raw)
To: Miguel Ojeda; +Cc: Stefan Richter, akpm, linux-kernel
On Sat, 30 Sep 2006 22:45:56 +0000 Miguel Ojeda wrote:
> Randy, I'm testing right now the V7 of the driver after fixing all
> your mistakes found. Thank you for your deep work: the sharing of the
> buffer was a very good point. Finally I allocated both 2 (the bigger
> and the smaller one at the initialization).
>
> In a few minutes I will send the V7 patch.
>
> About "lcdisplay":
>
> On 9/30/06, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > On Sat, 30 Sep 2006 23:36:44 +0200 Stefan Richter wrote:
> >
> > > ...
> > > >> patching file drivers/lcddisplay/cfag12864b.c
> > > ...
> > >
> > > What does the D in LCD stand for? I suggest this is named
> > > drivers/lcdisplay/ instead.
> >
> > Yes, someone else mentioned that too.
> > It does mean Display.
> > not a big deal to me in this age of acronyms.
> >
>
> Well, I can rename it, but there is a problem:
>
> How should I write the name in other places?
>
> I mean, for example, in Kconfig:
>
> tristate "KS0108 LCD Controller"
>
> if the ks0108 is a LCD controller, then
>
> tristate "CFAG12864B LCD Display"
That seems very common to me.
> should be the right way to write it?
>
> tristate "CFAG12864B LCDisplay"
>
> seems so ugly to me. Is it? Remember, this applies for all the other
> places in the documentation / source code / ...
>
> IMHO it seems better as LCD Display. Yeah, drivers/lcdisplay/ would be
> nice, but I don't think the same about other places:
>
> LCD Controller.
OK
> LCDisplay??
I would continue to use LCD display (small d).
---
~Randy
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-09-30 22:52 ` Randy Dunlap
@ 2006-10-01 8:20 ` Stefan Richter
2006-10-01 16:40 ` Randy Dunlap
0 siblings, 1 reply; 12+ messages in thread
From: Stefan Richter @ 2006-10-01 8:20 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Miguel Ojeda, akpm, linux-kernel
Randy Dunlap wrote:
> On Sat, 30 Sep 2006 22:45:56 +0000 Miguel Ojeda wrote:
...
>> tristate "CFAG12864B LCD Display"
>
> That seems very common to me.
It is as common as it is wrong. http://en.wikipedia.org/wiki/RAS_Syndrome
...
>> LCDisplay??
A contraction like LCDisplay, like my suggested lcdisplay for the path
name, is IMO not suitable for use in normal written language. Use it at
most for path names where we contract words into one or would write
lc-display or lc_display.
> I would continue to use LCD display (small d).
Still wrong language.
"LCD" and "LC display" are correct.
--
Stefan Richter
-=====-=-==- =-=- ----=
http://arcgraph.de/sr/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-10-01 8:20 ` Stefan Richter
@ 2006-10-01 16:40 ` Randy Dunlap
2006-10-01 17:46 ` Stefan Richter
0 siblings, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2006-10-01 16:40 UTC (permalink / raw)
To: Stefan Richter; +Cc: Miguel Ojeda, akpm, linux-kernel
On Sun, 01 Oct 2006 10:20:41 +0200 Stefan Richter wrote:
> Randy Dunlap wrote:
> > On Sat, 30 Sep 2006 22:45:56 +0000 Miguel Ojeda wrote:
> ...
> >> tristate "CFAG12864B LCD Display"
> >
> > That seems very common to me.
>
> It is as common as it is wrong. http://en.wikipedia.org/wiki/RAS_Syndrome
>
> ...
> >> LCDisplay??
>
> A contraction like LCDisplay, like my suggested lcdisplay for the path
> name, is IMO not suitable for use in normal written language. Use it at
> most for path names where we contract words into one or would write
> lc-display or lc_display.
>
> > I would continue to use LCD display (small d).
>
> Still wrong language.
>
> "LCD" and "LC display" are correct.
whatever.
I've never heard anyone speak of or write about an LC display.
---
~Randy
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-10-01 16:40 ` Randy Dunlap
@ 2006-10-01 17:46 ` Stefan Richter
2006-10-01 18:04 ` Miguel Ojeda
0 siblings, 1 reply; 12+ messages in thread
From: Stefan Richter @ 2006-10-01 17:46 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Miguel Ojeda, akpm, linux-kernel
Randy Dunlap wrote:
> On Sun, 01 Oct 2006 10:20:41 +0200 Stefan Richter wrote:
...
>> It is as common as it is wrong. http://en.wikipedia.org/wiki/RAS_Syndrome
...
>> "LCD" and "LC display" are correct.
>
> whatever.
> I've never heard anyone speak of or write about an LC display.
Nor does anybody say or write AT machine. A web search finds 15 times
more occurrences of "LC-Display" on German pages than of "LC display" on
English pages. So it seams my suggestion of "LC display" is a bad one
for usage outside of Germany. BTW, "LCD-Display" is doubly as often
found on German web pages than "LC-Display" on German pages, and I'm not
surprised.
At some point, widely used words and expressions become accepted parts
of a language. "LCD display" however is evidently still considered bad
style --- in English as well as in German. But maybe this stylistic
mistake is more prone to criticism among Germans than among North
Americans. (Perhaps not) coincidentally, the other person who criticized
it in this thread is obviously German too.
--
Stefan Richter
-=====-=-==- =-=- ----=
http://arcgraph.de/sr/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2.6.18 V6] drivers: add lcd display support
2006-10-01 17:46 ` Stefan Richter
@ 2006-10-01 18:04 ` Miguel Ojeda
0 siblings, 0 replies; 12+ messages in thread
From: Miguel Ojeda @ 2006-10-01 18:04 UTC (permalink / raw)
To: Stefan Richter; +Cc: Randy Dunlap, akpm, linux-kernel
On 10/1/06, Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:
>
> Nor does anybody say or write AT machine. A web search finds 15 times
> more occurrences of "LC-Display" on German pages than of "LC display" on
> English pages. So it seams my suggestion of "LC display" is a bad one
> for usage outside of Germany. BTW, "LCD-Display" is doubly as often
> found on German web pages than "LC-Display" on German pages, and I'm not
> surprised.
>
Searching Google for "pantalla LCD" you can find 1.590.000 pages.
And it is wrong ;-)
(Please continue the discussion the same "thread" (V7) as it is the
last version of the patch I sent.)
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2006-10-01 18:04 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-09-30 13:22 [PATCH 2.6.18 V6] drivers: add lcd display support Miguel Ojeda Sandonis
2006-09-30 12:39 ` Jan-Benedict Glaw
2006-09-30 20:10 ` Miguel Ojeda
2006-09-30 19:35 ` Randy Dunlap
2006-09-30 21:36 ` Stefan Richter
2006-09-30 21:48 ` Randy Dunlap
2006-09-30 22:45 ` Miguel Ojeda
2006-09-30 22:52 ` Randy Dunlap
2006-10-01 8:20 ` Stefan Richter
2006-10-01 16:40 ` Randy Dunlap
2006-10-01 17:46 ` Stefan Richter
2006-10-01 18:04 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).