Skip to content

Commit

Permalink
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Browse files Browse the repository at this point in the history 
Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Feb 13, 2007
2 parents 43d78ef + ec2f9d1 commit d9bc125
Show file tree
Hide file tree
Showing 3,871 changed files with 178,485 additions and 91,416 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 10 additions & 0 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2571,6 +2571,16 @@ S: Subiaco, 6008
S: Perth, Western Australia
S: Australia

N: Miguel Ojeda Sandonis
E: maxextreme@gmail.com
D: Author: Auxiliary LCD Controller driver (ks0108)
D: Author: Auxiliary LCD driver (cfag12864b)
D: Author: Auxiliary LCD framebuffer driver (cfag12864bfb)
D: Maintainer: Auxiliary display drivers tree (drivers/auxdisplay/*)
S: C/ Mieses 20, 9-B
S: Valladolid 47009
S: Spain

N: Greg Page
E: gpage@sovereign.org
D: IPX development and support
Expand Down
5 changes: 2 additions & 3 deletions Documentation/ABI/testing/debugfs-pktcdvd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
What: /debug/pktcdvd/pktcdvd[0-7]
Date: Oct. 2006
KernelVersion: 2.6.19
KernelVersion: 2.6.20
Contact: Thomas Maier <balagi@justmail.de>
Description:

Expand All @@ -11,8 +11,7 @@ The pktcdvd module (packet writing driver) creates
these files in debugfs:

/debug/pktcdvd/pktcdvd[0-7]/
info (0444) Lots of human readable driver
statistics and infos. Multiple lines!
info (0444) Lots of driver statistics and infos.

Example:
-------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-class-pktcdvd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
What: /sys/class/pktcdvd/
Date: Oct. 2006
KernelVersion: 2.6.19
KernelVersion: 2.6.20
Contact: Thomas Maier <balagi@justmail.de>
Description:

Expand Down
4 changes: 2 additions & 2 deletions Documentation/DocBook/gadget.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,13 @@ slightly.
<para>Gadget drivers
rely on common USB structures and constants
defined in the
<filename>&lt;linux/usb_ch9.h&gt;</filename>
<filename>&lt;linux/usb/ch9.h&gt;</filename>
header file, which is standard in Linux 2.6 kernels.
These are the same types and constants used by host
side drivers (and usbcore).
</para>

!Iinclude/linux/usb_ch9.h
!Iinclude/linux/usb/ch9.h
</sect1>

<sect1 id="core"><title>Core Objects and Methods</title>
Expand Down
3 changes: 3 additions & 0 deletions Documentation/DocBook/kernel-api.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@ X!Earch/i386/kernel/mca.c
<sect1><title>DMI Interfaces</title>
!Edrivers/firmware/dmi_scan.c
</sect1>
<sect1><title>EDD Interfaces</title>
!Idrivers/firmware/edd.c
</sect1>
</chapter>

<chapter id="security">
Expand Down
1 change: 1 addition & 0 deletions Documentation/DocBook/stylesheet.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<param name="funcsynopsis.style">ansi</param>
<param name="funcsynopsis.tabular.threshold">80</param>
<!-- <param name="paper.type">A4</param> -->
<param name="generate.section.toc.level">2</param>
</stylesheet>
6 changes: 3 additions & 3 deletions Documentation/DocBook/usb.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@

<chapter><title>USB-Standard Types</title>

<para>In <filename>&lt;linux/usb_ch9.h&gt;</filename> you will find
<para>In <filename>&lt;linux/usb/ch9.h&gt;</filename> you will find
the USB data types defined in chapter 9 of the USB specification.
These data types are used throughout USB, and in APIs including
this host side API, gadget APIs, and usbfs.
</para>

!Iinclude/linux/usb_ch9.h
!Iinclude/linux/usb/ch9.h

</chapter>

Expand Down Expand Up @@ -574,7 +574,7 @@ for (;;) {
#include &lt;asm/byteorder.h&gt;</programlisting>
The standard USB device model requests, from "Chapter 9" of
the USB 2.0 specification, are automatically included from
the <filename>&lt;linux/usb_ch9.h&gt;</filename> header.
the <filename>&lt;linux/usb/ch9.h&gt;</filename> header.
</para>

<para>Unless noted otherwise, the ioctl requests
Expand Down
1 change: 1 addition & 0 deletions Documentation/HOWTO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ are not a good substitute for a solid C education and/or years of
experience, the following books are good for, if anything, reference:
- "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]
- "Practical C Programming" by Steve Oualline [O'Reilly]
- "C: A Reference Manual" by Harbison and Steele [Prentice Hall]

The kernel is written using GNU C and the GNU toolchain. While it
adheres to the ISO C89 standard, it uses a number of extensions that are
Expand Down
105 changes: 105 additions & 0 deletions Documentation/auxdisplay/cfag12864b
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
===================================
cfag12864b LCD Driver Documentation
===================================

License: GPLv2
Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>
Date: 2006-10-27



--------
0. INDEX
--------

1. DRIVER INFORMATION
2. DEVICE INFORMATION
3. WIRING
4. USERSPACE PROGRAMMING


---------------------
1. DRIVER INFORMATION
---------------------

This driver support one cfag12864b display at time.


---------------------
2. DEVICE INFORMATION
---------------------

Manufacturer: Crystalfontz
Device Name: Crystalfontz 12864b LCD Series
Device Code: cfag12864b
Webpage: http://www.crystalfontz.com
Device Webpage: http://www.crystalfontz.com/products/12864b/
Type: LCD (Liquid Crystal Display)
Width: 128
Height: 64
Colors: 2 (B/N)
Controller: ks0108
Controllers: 2
Pages: 8 each controller
Addresses: 64 each page
Data size: 1 byte each address
Memory size: 2 * 8 * 64 * 1 = 1024 bytes = 1 Kbyte


---------
3. WIRING
---------

The cfag12864b LCD Series don't have official wiring.

The common wiring is done to the parallel port as shown:

Parallel Port cfag12864b

Name Pin# Pin# Name

Strobe ( 1)------------------------------(17) Enable
Data 0 ( 2)------------------------------( 4) Data 0
Data 1 ( 3)------------------------------( 5) Data 1
Data 2 ( 4)------------------------------( 6) Data 2
Data 3 ( 5)------------------------------( 7) Data 3
Data 4 ( 6)------------------------------( 8) Data 4
Data 5 ( 7)------------------------------( 9) Data 5
Data 6 ( 8)------------------------------(10) Data 6
Data 7 ( 9)------------------------------(11) Data 7
(10) [+5v]---( 1) Vdd
(11) [GND]---( 2) Ground
(12) [+5v]---(14) Reset
(13) [GND]---(15) Read / Write
Line (14)------------------------------(13) Controller Select 1
(15)
Init (16)------------------------------(12) Controller Select 2
Select (17)------------------------------(16) Data / Instruction
Ground (18)---[GND] [+5v]---(19) LED +
Ground (19)---[GND]
Ground (20)---[GND] E A Values:
Ground (21)---[GND] [GND]---[P1]---(18) Vee � R = Resistor = 22 ohm
Ground (22)---[GND] | � P1 = Preset = 10 Kohm
Ground (23)---[GND] ---- S ------( 3) V0 � P2 = Preset = 1 Kohm
Ground (24)---[GND] | |
Ground (25)---[GND] [GND]---[P2]---[R]---(20) LED -


------------------------
4. USERSPACE PROGRAMMING
------------------------

The cfag12864bfb describes a framebuffer device (/dev/fbX).

It has a size of 1024 bytes = 1 Kbyte.
Each bit represents one pixel. If the bit is high, the pixel will
turn on. If the pixel is low, the pixel will turn off.

You can use the framebuffer as a file: fopen, fwrite, fclose...
Although the LCD won't get updated until the next refresh time arrives.

Also, you can mmap the framebuffer: open & mmap, munmap & close...
which is the best option for most uses.

Check Documentation/auxdisplay/cfag12864b-example.c
for a real working userspace complete program with usage examples.
Loading

0 comments on commit d9bc125

Please sign in to comment.