summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-10-07 16:59:31 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-07 16:59:31 +0000
commitec4471204f98aea123a32d1b1c7f01c68f47bb90 (patch)
tree59155b22df25616f7cac592aa5878ea2727e1ac7 /packages
parenta05f01de2c518771dceb6ab93f2a7c487d25c63a (diff)
parentfa12b55de5065e65b088529c06888c6b725f265a (diff)
merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
and d158643df91483ff93864d58c92e889b0050dea6
Diffstat (limited to 'packages')
-rw-r--r--packages/blueprobe/blueprobe-0.15/h6300.patch17
-rw-r--r--packages/blueprobe/blueprobe_0.15.bb5
-rw-r--r--packages/btscanner/btscanner-1.0/0909132213173.patch25
-rw-r--r--packages/btscanner/btscanner_1.0.bb6
-rw-r--r--packages/gpe-bootsplash/files/cairofix.patch43
-rw-r--r--packages/gpe-bootsplash/files/splash-l.svg46
-rw-r--r--packages/gpe-bootsplash/files/splash-p.svg72
-rw-r--r--packages/gpe-bootsplash/gpe-bootsplash_1.14.bb5
-rw-r--r--packages/gpe-login/gpe-login_0.83.bb13
-rw-r--r--packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb14
-rw-r--r--packages/libgpewidget/libgpewidget_cvs.bb23
-rw-r--r--packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch25
-rw-r--r--packages/libsdl/libsdl-qpe_1.2.7.bb6
-rw-r--r--packages/libsdl/libsdl-x11_1.2.7.bb3
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch64
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/30-i2c-x1205.patch148
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/50-nslu2-general.patch439
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/60-nslu2-beeper.patch (renamed from packages/linux/nslu2-kernel/2.6.14/50-nslu2-beeper.patch)90
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/defconfig346
-rw-r--r--packages/linux/nslu2-kernel_2.6.14-rc3.bb4
-rw-r--r--packages/linux/openslug-kernel-2.6.14-rc3/defconfig18
-rw-r--r--packages/linux/openslug-kernel_2.6.14-rc3.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.2.bb3
-rw-r--r--packages/meta/gpe-image.bb33
-rw-r--r--packages/meta/meta-gpe.bb14
-rw-r--r--packages/meta/openslug-packages.bb1
-rw-r--r--packages/meta/ucslugc-native.bb6
-rw-r--r--packages/rpm2cpio/rpm2cpio-native_1.2_2.bb2
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb10
-rw-r--r--packages/zd1211/zd1211-20050315/.mtn2git_empty0
-rw-r--r--packages/zd1211/zd1211-20050315/Makefile.patch15
-rw-r--r--packages/zd1211/zd1211-20050822/access_ok.patch11
-rw-r--r--packages/zd1211/zd1211-20050822/iwconfig-rate.patch126
-rw-r--r--packages/zd1211/zd1211-20050822/urb-async.patch82
-rw-r--r--packages/zd1211/zd1211_20050315.bb32
-rw-r--r--packages/zd1211/zd1211_20050822.bb7
36 files changed, 1454 insertions, 302 deletions
diff --git a/packages/blueprobe/blueprobe-0.15/h6300.patch b/packages/blueprobe/blueprobe-0.15/h6300.patch
new file mode 100644
index 0000000000..39de7758b0
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.15/h6300.patch
@@ -0,0 +1,17 @@
+diff -Naur blueprobe-0.15_orig/blueprobe.init blueprobe-0.15_h6300_fix/blueprobe.init
+--- blueprobe-0.15_orig/blueprobe.init 2005-10-05 22:37:35.706302041 +0300
++++ blueprobe-0.15_h6300_fix/blueprobe.init 2005-10-05 22:54:51.840676832 +0300
+@@ -57,6 +57,13 @@
+ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts
+ PROBE=no
+ ;;
++ "HP iPAQ H6300")
++ BLUETOOTH=yes
++ PORT=/dev/ttyS0
++ SPEED=115200
++ PROTO=texas
++ PROBE=no
++ ;;
+ *)
+ BLUETOOTH=no
+ ;;
diff --git a/packages/blueprobe/blueprobe_0.15.bb b/packages/blueprobe/blueprobe_0.15.bb
index 0d3b5042b5..282387707a 100644
--- a/packages/blueprobe/blueprobe_0.15.bb
+++ b/packages/blueprobe/blueprobe_0.15.bb
@@ -2,6 +2,7 @@ SECTION = "base"
LICENSE = "GPL"
inherit gpe
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://hx4700.patch;patch=1"
+SRC_URI += "file://hx4700.patch;patch=1 \
+ file://h6300.patch;patch=1"
diff --git a/packages/btscanner/btscanner-1.0/0909132213173.patch b/packages/btscanner/btscanner-1.0/0909132213173.patch
new file mode 100644
index 0000000000..1c4db165a5
--- /dev/null
+++ b/packages/btscanner/btscanner-1.0/0909132213173.patch
@@ -0,0 +1,25 @@
+--- /tmp/bs_info.c 2005-10-07 16:04:20.842924176 +0200
++++ btscanner-1.0/bs_info.c 2005-10-07 16:08:26.368598600 +0200
+@@ -160,7 +160,7 @@
+ struct hci_conn_info_req *cr;
+ struct hci_request rq;
+ read_rssi_rp rp_rssi;
+- get_link_quality_rp rp_lq;
++ read_link_quality_rp rp_lq;
+ int err = 0;
+ int leave = 0;;
+
+@@ -292,11 +292,11 @@
+ memset(&rq, 0, sizeof(rq));
+ memset(&rp_lq, 0, sizeof(rp_lq));
+ rq.ogf = OGF_STATUS_PARAM;
+- rq.ocf = OCF_GET_LINK_QUALITY;
++ rq.ocf = OCF_READ_LINK_QUALITY;
+ rq.cparam = &handle;
+ rq.clen = 2;
+ rq.rparam = &rp_lq;
+- rq.rlen = GET_LINK_QUALITY_RP_SIZE;
++ rq.rlen = READ_LINK_QUALITY_RP_SIZE;
+
+ if (hci_send_req(dd, &rq, 100) < 0) {
+ p->lq_status = (uint8_t)-1;
diff --git a/packages/btscanner/btscanner_1.0.bb b/packages/btscanner/btscanner_1.0.bb
index d45b7acd3a..d08e3e1ae8 100644
--- a/packages/btscanner/btscanner_1.0.bb
+++ b/packages/btscanner/btscanner_1.0.bb
@@ -3,10 +3,14 @@ SECTION = "libs"
PRIORITY = "optional"
HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
DEPENDS = "bluez-libs gdbm ncurses"
-PR = "r2"
+PR = "r3"
LICENSE = "GPLv2"
SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \
+ file://0909132213173.patch;patch=1 \
file://configure.patch;patch=1"
+#Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
+FILES_${PN} += "/usr/etc/oui.txt"
+
inherit autotools
diff --git a/packages/gpe-bootsplash/files/cairofix.patch b/packages/gpe-bootsplash/files/cairofix.patch
new file mode 100644
index 0000000000..ff6e288cbc
--- /dev/null
+++ b/packages/gpe-bootsplash/files/cairofix.patch
@@ -0,0 +1,43 @@
+--- /tmp/splash.c 2005-10-06 14:45:21.463681488 +0200
++++ gpe-bootsplash-1.14/splash.c 2005-10-06 14:45:29.480462752 +0200
+@@ -118,7 +118,8 @@
+
+ tty = open ("/dev/tty0", O_RDWR);
+ if (tty < 0)
+- perror ("open");
++ tty = open ("/dev/vc/0", O_RDWR);
++ if (tty < 0) perror ("open");
+ else
+ {
+ write (tty, cursoff, strlen (cursoff));
+@@ -176,6 +177,7 @@
+ double scale, xscale, yscale;
+ svg_cairo_status_t status;
+ int width, height;
++ cairo_surface_t *surface;
+
+ status = svg_cairo_create (&svgc);
+ if (status)
+@@ -201,17 +203,17 @@
+ xsize = (double)width * scale + 0.5;
+ ysize = (double)height * scale + 0.5;
+
+- cr = cairo_create ();
+- cairo_scale (cr, scale, scale);
+
+ pix = malloc (xsize * ysize * 4);
+ stride = xsize * 4;
+ has_alpha = TRUE;
+
+- cairo_set_target_image (cr, pix, CAIRO_FORMAT_ARGB32, xsize, ysize, xsize * 4);
+-
++ surface = cairo_image_surface_create_for_data(pix, CAIRO_FORMAT_ARGB32, xsize, ysize, stride);
++ cr = cairo_create (surface);
++ cairo_scale (cr, scale, scale);
++
+ /* XXX: This probably doesn't need to be here (eventually) */
+- cairo_set_rgb_color (cr, 1, 1, 1);
++ cairo_set_source_rgb (cr, 1, 1, 1);
+
+ svg_cairo_render (svgc, cr);
+
diff --git a/packages/gpe-bootsplash/files/splash-l.svg b/packages/gpe-bootsplash/files/splash-l.svg
index 9218e2f679..fa5ca4805e 100644
--- a/packages/gpe-bootsplash/files/splash-l.svg
+++ b/packages/gpe-bootsplash/files/splash-l.svg
@@ -1,33 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg1"
sodipodi:version="0.32"
- inkscape:version="0.40"
+ inkscape:version="0.42"
width="8.0000000cm"
height="6.0000000cm"
sodipodi:docname="splash-l.svg"
- sodipodi:docbase="/home/pb/handhelds/gpe/gpe-logo"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
+ sodipodi:docbase="/home/koen/Desktop">
<metadata
id="metadata27">
- <rdf:RDF
- id="RDF28">
+ <rdf:RDF>
<cc:Work
- rdf:about=""
- id="Work29">
- <dc:format
- id="format30">image/svg+xml</dc:format>
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- id="type32"
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
@@ -44,12 +38,12 @@
inkscape:zoom="2.0000000"
inkscape:cx="130.17183"
inkscape:cy="82.153473"
- inkscape:window-width="1356"
- inkscape:window-height="1181"
+ inkscape:window-width="1024"
+ inkscape:window-height="746"
showguides="true"
snaptoguides="true"
- inkscape:window-x="130"
- inkscape:window-y="124"
+ inkscape:window-x="1171"
+ inkscape:window-y="138"
inkscape:current-layer="svg1" />
<path
style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;"
@@ -163,8 +157,8 @@
sodipodi:nodetypes="cssssss" />
</g>
<path
- transform="translate(-26.87500,-34.37500)"
- style="font-size:24.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr"
- d="M 60.535156,191.35233 L 60.535156,186.65311 L 56.667969,186.65311 L 56.667969,184.70779 L 62.878906,184.70779 L 62.878906,192.21951 C 61.964828,192.86795 60.957017,193.36014 59.855469,193.69608 C 58.753894,194.02420 57.578114,194.18826 56.328125,194.18826 C 53.593743,194.18826 51.453120,193.39139 49.906250,191.79764 C 48.367185,190.19608 47.597655,187.96952 47.597656,185.11795 C 47.597655,182.25859 48.367185,180.03203 49.906250,178.43826 C 51.453120,176.83672 53.593743,176.03594 56.328125,176.03592 C 57.468739,176.03594 58.550769,176.17656 59.574219,176.45779 C 60.605454,176.73906 61.554672,177.15312 62.421875,177.69998 L 62.421875,180.21951 C 61.546860,179.47734 60.617173,178.91875 59.632812,178.54373 C 58.648425,178.16875 57.613270,177.98125 56.527344,177.98123 C 54.386711,177.98125 52.777337,178.57890 51.699219,179.77420 C 50.628902,180.96953 50.093746,182.75077 50.093750,185.11795 C 50.093746,187.47733 50.628902,189.25467 51.699219,190.44998 C 52.777337,191.64530 54.386711,192.24295 56.527344,192.24295 C 57.363270,192.24295 58.109363,192.17264 58.765625,192.03201 C 59.421862,191.88358 60.011705,191.65702 60.535156,191.35233 M 69.582031,178.29764 L 69.582031,184.87186 L 72.558594,184.87186 C 73.660147,184.87187 74.511709,184.58671 75.113281,184.01639 C 75.714833,183.44609 76.015614,182.63359 76.015625,181.57889 C 76.015614,180.53203 75.714833,179.72343 75.113281,179.15311 C 74.511709,178.58281 73.660147,178.29765 72.558594,178.29764 L 69.582031,178.29764 M 67.214844,176.35233 L 72.558594,176.35233 C 74.519522,176.35234 75.999989,176.79765 77.000000,177.68826 C 78.007799,178.57109 78.511705,179.86796 78.511719,181.57889 C 78.511705,183.30546 78.007799,184.61015 77.000000,185.49295 C 75.999989,186.37577 74.519522,186.81718 72.558594,186.81717 L 69.582031,186.81717 L 69.582031,193.84842 L 67.214844,193.84842 L 67.214844,176.35233 M 81.699219,176.35233 L 92.761719,176.35233 L 92.761719,178.34451 L 84.066406,178.34451 L 84.066406,183.52420 L 92.398438,183.52420 L 92.398438,185.51639 L 84.066406,185.51639 L 84.066406,191.85623 L 92.972656,191.85623 L 92.972656,193.84842 L 81.699219,193.84842 L 81.699219,176.35233 M 106.77734,191.85623 L 115.03906,191.85623 L 115.03906,193.84842 L 103.92969,193.84842 L 103.92969,191.85623 C 104.82812,190.92655 106.05078,189.68045 107.59766,188.11795 C 109.15234,186.54765 110.12890,185.53593 110.52734,185.08279 C 111.28515,184.23124 111.81249,183.51249 112.10938,182.92654 C 112.41405,182.33281 112.56640,181.75078 112.56641,181.18045 C 112.56640,180.25078 112.23827,179.49296 111.58203,178.90701 C 110.93358,178.32109 110.08593,178.02812 109.03906,178.02811 C 108.29687,178.02812 107.51171,178.15703 106.68359,178.41483 C 105.86328,178.67265 104.98437,179.06328 104.04688,179.58670 L 104.04688,177.19608 C 105.00000,176.81328 105.89062,176.52422 106.71875,176.32889 C 107.54687,176.13359 108.30468,176.03594 108.99219,176.03592 C 110.80468,176.03594 112.24999,176.48906 113.32812,177.39529 C 114.40624,178.30156 114.94530,179.51250 114.94531,181.02811 C 114.94530,181.74687 114.80858,182.43046 114.53516,183.07889 C 114.26952,183.71952 113.78124,184.47733 113.07031,185.35233 C 112.87499,185.57890 112.25390,186.23515 111.20703,187.32108 C 110.16015,188.39921 108.68359,189.91092 106.77734,191.85623 M 120.01953,190.87186 L 122.49219,190.87186 L 122.49219,193.84842 L 120.01953,193.84842 L 120.01953,190.87186 M 133.01562,184.15701 C 131.95312,184.15702 131.10937,184.52030 130.48438,185.24686 C 129.86718,185.97343 129.55859,186.96952 129.55859,188.23514 C 129.55859,189.49295 129.86718,190.48905 130.48438,191.22342 C 131.10937,191.94998 131.95312,192.31326 133.01562,192.31326 C 134.07812,192.31326 134.91796,191.94998 135.53516,191.22342 C 136.16015,190.48905 136.47264,189.49295 136.47266,188.23514 C 136.47264,186.96952 136.16015,185.97343 135.53516,185.24686 C 134.91796,184.52030 134.07812,184.15702 133.01562,184.15701 M 137.71484,176.73904 L 137.71484,178.89529 C 137.12108,178.61406 136.51952,178.39922 135.91016,178.25076 C 135.30858,178.10234 134.71093,178.02812 134.11719,178.02811 C 132.55468,178.02812 131.35937,178.55547 130.53125,179.61014 C 129.71093,180.66484 129.24218,182.25859 129.12500,184.39139 C 129.58593,183.71171 130.16406,183.19218 130.85938,182.83279 C 131.55468,182.46562 132.32031,182.28202 133.15625,182.28201 C 134.91405,182.28202 136.30077,182.81718 137.31641,183.88748 C 138.33983,184.94999 138.85155,186.39921 138.85156,188.23514 C 138.85155,190.03202 138.32030,191.47342 137.25781,192.55936 C 136.19530,193.64529 134.78124,194.18826 133.01562,194.18826 C 130.99218,194.18826 129.44531,193.41483 128.37500,191.86795 C 127.30469,190.31327 126.76953,188.06327 126.76953,185.11795 C 126.76953,182.35234 127.42578,180.14921 128.73828,178.50858 C 130.05078,176.86015 131.81249,176.03594 134.02344,176.03592 C 134.61718,176.03594 135.21483,176.09453 135.81641,176.21170 C 136.42577,176.32891 137.05858,176.50469 137.71484,176.73904"
- id="text1083" />
+ transform="scale(1.016596,0.983675)"
+ style="font-size:24.295891px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+ d="M 32.449651,158.02394 L 32.449651,153.26679 L 28.534786,153.26679 L 28.534786,151.29749 L 34.822297,151.29749 L 34.822297,158.90182 C 33.896949,159.55826 32.876713,160.05651 31.761584,160.39659 C 30.646428,160.72876 29.456152,160.89485 28.190753,160.89485 C 25.422659,160.89485 23.255645,160.08815 21.689704,158.47475 C 20.131664,156.85344 19.352646,154.59943 19.352648,151.71271 C 19.352646,148.81809 20.131664,146.56408 21.689704,144.95067 C 23.255645,143.32938 25.422659,142.51872 28.190753,142.51871 C 29.345429,142.51872 30.440799,142.66108 31.476867,142.94578 C 32.520816,143.23052 33.481737,143.64968 34.359631,144.20328 L 34.359631,146.75388 C 33.473828,146.00255 32.532680,145.43707 31.536183,145.05744 C 30.539659,144.67783 29.491742,144.48802 28.392428,144.48800 C 26.225403,144.48802 24.596188,145.09304 23.504778,146.30308 C 22.421265,147.51314 21.879511,149.31635 21.879515,151.71271 C 21.879511,154.10118 22.421265,155.90043 23.504778,157.11048 C 24.596188,158.32053 26.225403,158.92555 28.392428,158.92555 C 29.238660,158.92555 29.993951,158.85437 30.658304,158.71201 C 31.322631,158.56175 31.919747,158.33239 32.449651,158.02394 M 41.608064,144.80831 L 41.608064,151.46358 L 44.621324,151.46358 C 45.736458,151.46359 46.598518,151.17492 47.207507,150.59756 C 47.816475,150.02023 48.120964,149.19771 48.120976,148.13001 C 48.120964,147.07024 47.816475,146.25168 47.207507,145.67432 C 46.598518,145.09700 45.736458,144.80832 44.621324,144.80831 L 41.608064,144.80831 M 39.211692,142.83901 L 44.621324,142.83901 C 46.606427,142.83903 48.105147,143.28983 49.117487,144.19142 C 50.137711,145.08513 50.647829,146.39799 50.647843,148.13001 C 50.647829,149.87787 50.137711,151.19864 49.117487,152.09233 C 48.105147,152.98603 46.606427,153.43288 44.621324,153.43288 L 41.608064,153.43288 L 41.608064,160.55081 L 39.211692,160.55081 L 39.211692,142.83901 M 53.874640,142.83901 L 65.073527,142.83901 L 65.073527,144.85576 L 56.271012,144.85576 L 56.271012,150.09931 L 64.705767,150.09931 L 64.705767,152.11606 L 56.271012,152.11606 L 56.271012,158.53406 L 65.287065,158.53406 L 65.287065,160.55081 L 53.874640,160.55081 L 53.874640,142.83901 M 79.261950,158.53406 L 87.625525,158.53406 L 87.625525,160.55081 L 76.379185,160.55081 L 76.379185,158.53406 C 77.288697,157.59292 78.526425,156.33146 80.092375,154.74969 C 81.666223,153.16003 82.654825,152.13584 83.058182,151.67712 C 83.825329,150.81507 84.359173,150.08746 84.659718,149.49428 C 84.968152,148.89322 85.122374,148.30402 85.122384,147.72666 C 85.122374,146.78553 84.790204,146.01837 84.125873,145.42520 C 83.469432,144.83205 82.611326,144.53547 81.551552,144.53545 C 80.800209,144.53547 80.005373,144.66597 79.167044,144.92694 C 78.336614,145.18795 77.446873,145.58339 76.497817,146.11326 L 76.497817,143.69316 C 77.462690,143.30565 78.364295,143.01302 79.202633,142.81529 C 80.040963,142.61758 80.808117,142.51872 81.504100,142.51871 C 83.338937,142.51872 84.802067,142.97743 85.893494,143.89484 C 86.984899,144.81228 87.530606,146.03814 87.530619,147.57244 C 87.530606,148.30006 87.392202,148.99208 87.115406,149.64851 C 86.846494,150.29704 86.352194,151.06419 85.632503,151.94997 C 85.434772,152.17934 84.806021,152.84368 83.746250,153.94299 C 82.686460,155.03442 81.191695,156.56477 79.261950,158.53406 M 92.667394,157.53755 L 95.170535,157.53755 L 95.170535,160.55081 L 92.667394,160.55081 L 92.667394,157.53755 M 99.797195,142.83901 L 111.18589,142.83901 L 111.18589,143.85925 L 104.75602,160.55081 L 102.25288,160.55081 L 108.30313,144.85576 L 99.797195,144.85576 L 99.797195,142.83901"
+ id="text1432" />
</svg>
diff --git a/packages/gpe-bootsplash/files/splash-p.svg b/packages/gpe-bootsplash/files/splash-p.svg
index cce894e2e9..ae93bed70f 100644
--- a/packages/gpe-bootsplash/files/splash-p.svg
+++ b/packages/gpe-bootsplash/files/splash-p.svg
@@ -1,35 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg1"
sodipodi:version="0.32"
- inkscape:version="0.40"
+ inkscape:version="0.42"
width="170.00000pt"
height="226.00000pt"
- sodipodi:docname="splash-p2.svg"
- sodipodi:docbase="/home/pb/handhelds/gpe/gpe-logo"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
+ sodipodi:docname="splash-p.svg"
+ sodipodi:docbase="/home/koen/Desktop">
<metadata
id="metadata1148">
- <rdf:RDF
- id="RDF1149">
+ <rdf:RDF>
<cc:Work
- rdf:about=""
- id="Work1150">
- <dc:format
- id="format1151">image/svg+xml</dc:format>
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- id="type1153"
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
</rdf:RDF>
</metadata>
<defs
@@ -42,15 +53,17 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.0000000"
- inkscape:cx="130.17183"
- inkscape:cy="82.153473"
- inkscape:window-width="1356"
- inkscape:window-height="1181"
+ inkscape:cx="123.79126"
+ inkscape:cy="136.70730"
+ inkscape:window-width="674"
+ inkscape:window-height="682"
showguides="true"
snaptoguides="true"
- inkscape:window-x="606"
- inkscape:window-y="27"
- inkscape:current-layer="svg1" />
+ inkscape:window-x="1066"
+ inkscape:window-y="190"
+ inkscape:current-layer="svg1"
+ showborder="true"
+ inkscape:showpageshadow="false" />
<path
style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;"
d="M 150.60592,91.743209 C 150.60592,126.90946 122.06521,155.45016 86.898980,155.45016 C 51.732741,155.45016 23.192037,126.90946 23.192037,91.743209 C 23.192037,56.576987 51.732741,28.036281 86.898980,28.036281 C 122.06521,28.036281 150.60592,56.576987 150.60592,91.743209 z M 125.59088,91.743225 C 125.59088,123.01260 108.25691,148.39065 86.898996,148.39065 C 65.541064,148.39065 48.207098,123.01260 48.207098,91.743225 C 48.207098,60.473843 65.541064,35.095803 86.898996,35.095803 C 108.25691,35.095803 125.59088,60.473843 125.59088,91.743225 z "
@@ -165,8 +178,7 @@
sodipodi:nodetypes="cssssss" />
</g>
<path
- transform="translate(2.500000,-15.00000)"
- style="font-size:24.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr"
- d="M 69.910156,140.00391 L 69.910156,135.30469 L 66.042969,135.30469 L 66.042969,133.35938 L 72.253906,133.35938 L 72.253906,140.87109 C 71.339828,141.51953 70.332017,142.01172 69.230469,142.34766 C 68.128894,142.67578 66.953114,142.83984 65.703125,142.83984 C 62.968743,142.83984 60.828120,142.04297 59.281250,140.44922 C 57.742185,138.84766 56.972655,136.62110 56.972656,133.76953 C 56.972655,130.91017 57.742185,128.68361 59.281250,127.08984 C 60.828120,125.48830 62.968743,124.68752 65.703125,124.68750 C 66.843739,124.68752 67.925769,124.82814 68.949219,125.10938 C 69.980454,125.39064 70.929672,125.80470 71.796875,126.35156 L 71.796875,128.87109 C 70.921860,128.12892 69.992173,127.57033 69.007812,127.19531 C 68.023425,126.82033 66.988270,126.63283 65.902344,126.63281 C 63.761711,126.63283 62.152337,127.23048 61.074219,128.42578 C 60.003902,129.62111 59.468746,131.40235 59.468750,133.76953 C 59.468746,136.12891 60.003902,137.90625 61.074219,139.10156 C 62.152337,140.29688 63.761711,140.89453 65.902344,140.89453 C 66.738270,140.89453 67.484363,140.82422 68.140625,140.68359 C 68.796862,140.53516 69.386705,140.30860 69.910156,140.00391 M 78.957031,126.94922 L 78.957031,133.52344 L 81.933594,133.52344 C 83.035147,133.52345 83.886709,133.23829 84.488281,132.66797 C 85.089833,132.09767 85.390614,131.28517 85.390625,130.23047 C 85.390614,129.18361 85.089833,128.37501 84.488281,127.80469 C 83.886709,127.23439 83.035147,126.94923 81.933594,126.94922 L 78.957031,126.94922 M 76.589844,125.00391 L 81.933594,125.00391 C 83.894522,125.00392 85.374989,125.44924 86.375000,126.33984 C 87.382799,127.22267 87.886705,128.51955 87.886719,130.23047 C 87.886705,131.95704 87.382799,133.26173 86.375000,134.14453 C 85.374989,135.02735 83.894522,135.46876 81.933594,135.46875 L 78.957031,135.46875 L 78.957031,142.50000 L 76.589844,142.50000 L 76.589844,125.00391 M 91.074219,125.00391 L 102.13672,125.00391 L 102.13672,126.99609 L 93.441406,126.99609 L 93.441406,132.17578 L 101.77344,132.17578 L 101.77344,134.16797 L 93.441406,134.16797 L 93.441406,140.50781 L 102.34766,140.50781 L 102.34766,142.50000 L 91.074219,142.50000 L 91.074219,125.00391 M 116.15234,140.50781 L 124.41406,140.50781 L 124.41406,142.50000 L 113.30469,142.50000 L 113.30469,140.50781 C 114.20312,139.57813 115.42578,138.33204 116.97266,136.76953 C 118.52734,135.19923 119.50390,134.18751 119.90234,133.73438 C 120.66015,132.88282 121.18749,132.16407 121.48438,131.57812 C 121.78905,130.98439 121.94140,130.40236 121.94141,129.83203 C 121.94140,128.90236 121.61327,128.14455 120.95703,127.55859 C 120.30858,126.97267 119.46093,126.67970 118.41406,126.67969 C 117.67187,126.67970 116.88671,126.80861 116.05859,127.06641 C 115.23828,127.32423 114.35937,127.71486 113.42188,128.23828 L 113.42188,125.84766 C 114.37500,125.46486 115.26562,125.17580 116.09375,124.98047 C 116.92187,124.78517 117.67968,124.68752 118.36719,124.68750 C 120.17968,124.68752 121.62499,125.14064 122.70312,126.04688 C 123.78124,126.95314 124.32030,128.16408 124.32031,129.67969 C 124.32030,130.39845 124.18358,131.08204 123.91016,131.73047 C 123.64452,132.37110 123.15624,133.12892 122.44531,134.00391 C 122.24999,134.23048 121.62890,134.88673 120.58203,135.97266 C 119.53515,137.05079 118.05859,138.56250 116.15234,140.50781 M 129.39453,139.52344 L 131.86719,139.52344 L 131.86719,142.50000 L 129.39453,142.50000 L 129.39453,139.52344 M 142.39062,132.80859 C 141.32812,132.80860 140.48437,133.17188 139.85938,133.89844 C 139.24218,134.62501 138.93359,135.62110 138.93359,136.88672 C 138.93359,138.14454 139.24218,139.14063 139.85938,139.87500 C 140.48437,140.60156 141.32812,140.96485 142.39062,140.96484 C 143.45312,140.96485 144.29296,140.60156 144.91016,139.87500 C 145.53515,139.14063 145.84764,138.14454 145.84766,136.88672 C 145.84764,135.62110 145.53515,134.62501 144.91016,133.89844 C 144.29296,133.17188 143.45312,132.80860 142.39062,132.80859 M 147.08984,125.39062 L 147.08984,127.54688 C 146.49608,127.26564 145.89452,127.05080 145.28516,126.90234 C 144.68358,126.75392 144.08593,126.67970 143.49219,126.67969 C 141.92968,126.67970 140.73437,127.20705 139.90625,128.26172 C 139.08593,129.31642 138.61718,130.91017 138.50000,133.04297 C 138.96093,132.36329 139.53906,131.84376 140.23438,131.48438 C 140.92968,131.11720 141.69531,130.93361 142.53125,130.93359 C 144.28905,130.93361 145.67577,131.46876 146.69141,132.53906 C 147.71483,133.60157 148.22655,135.05079 148.22656,136.88672 C 148.22655,138.68360 147.69530,140.12500 146.63281,141.21094 C 145.57030,142.29688 144.15624,142.83984 142.39062,142.83984 C 140.36718,142.83984 138.82031,142.06641 137.75000,140.51953 C 136.67969,138.96485 136.14453,136.71485 136.14453,133.76953 C 136.14453,131.00392 136.80078,128.80079 138.11328,127.16016 C 139.42578,125.51174 141.18749,124.68752 143.39844,124.68750 C 143.99218,124.68752 144.58983,124.74611 145.19141,124.86328 C 145.80077,124.98049 146.43358,125.15627 147.08984,125.39062"
- id="text1154" />
+ style="font-size:24.000000px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+ d="M 70.932617,129.37206 L 70.932617,124.67284 L 67.065430,124.67284 L 67.065430,122.72753 L 73.276367,122.72753 L 73.276367,130.23925 C 72.362289,130.88769 71.354477,131.37988 70.252930,131.71581 C 69.151355,132.04394 67.975575,132.20800 66.725586,132.20800 C 63.991204,132.20800 61.850581,131.41113 60.303711,129.81738 C 58.764646,128.21582 57.995116,125.98926 57.995117,123.13769 C 57.995116,120.27832 58.764646,118.05176 60.303711,116.45800 C 61.850581,114.85645 63.991204,114.05567 66.725586,114.05566 C 67.866200,114.05567 68.948230,114.19630 69.971680,114.47753 C 71.002915,114.75880 71.952133,115.17286 72.819336,115.71972 L 72.819336,118.23925 C 71.944321,117.49708 71.014634,116.93848 70.030273,116.56347 C 69.045886,116.18848 68.010731,116.00098 66.924805,116.00097 C 64.784172,116.00098 63.174798,116.59864 62.096680,117.79394 C 61.026363,118.98926 60.491207,120.77051 60.491211,123.13769 C 60.491207,125.49707 61.026363,127.27441 62.096680,128.46972 C 63.174798,129.66503 64.784172,130.26269 66.924805,130.26269 C 67.760731,130.26269 68.506824,130.19238 69.163086,130.05175 C 69.819323,129.90331 70.409166,129.67675 70.932617,129.37206 M 79.979492,116.31738 L 79.979492,122.89159 L 82.956055,122.89159 C 84.057608,122.89160 84.909170,122.60645 85.510742,122.03613 C 86.112294,121.46582 86.413075,120.65332 86.413086,119.59863 C 86.413075,118.55176 86.112294,117.74317 85.510742,117.17284 C 84.909170,116.60255 84.057608,116.31739 82.956055,116.31738 L 79.979492,116.31738 M 77.612305,114.37206 L 82.956055,114.37206 C 84.916983,114.37208 86.397450,114.81739 87.397461,115.70800 C 88.405260,116.59083 88.909166,117.88770 88.909180,119.59863 C 88.909166,121.32520 88.405260,122.62988 87.397461,123.51269 C 86.397450,124.39551 84.916983,124.83691 82.956055,124.83691 L 79.979492,124.83691 L 79.979492,131.86816 L 77.612305,131.86816 L 77.612305,114.37206 M 92.096680,114.37206 L 103.15918,114.37206 L 103.15918,116.36425 L 94.463867,116.36425 L 94.463867,121.54394 L 102.79590,121.54394 L 102.79590,123.53613 L 94.463867,123.53613 L 94.463867,129.87597 L 103.37012,129.87597 L 103.37012,131.86816 L 92.096680,131.86816 L 92.096680,114.37206 M 117.17480,129.87597 L 125.43652,129.87597 L 125.43652,131.86816 L 114.32715,131.86816 L 114.32715,129.87597 C 115.22558,128.94628 116.44824,127.70019 117.99512,126.13769 C 119.54980,124.56738 120.52636,123.55566 120.92480,123.10253 C 121.68261,122.25098 122.20995,121.53223 122.50684,120.94628 C 122.81151,120.35254 122.96386,119.77051 122.96387,119.20019 C 122.96386,118.27051 122.63573,117.51270 121.97949,116.92675 C 121.33105,116.34083 120.48339,116.04786 119.43652,116.04784 C 118.69433,116.04786 117.90917,116.17677 117.08105,116.43456 C 116.26074,116.69239 115.38183,117.08301 114.44434,117.60644 L 114.44434,115.21581 C 115.39746,114.83302 116.28808,114.54396 117.11621,114.34863 C 117.94433,114.15333 118.70214,114.05567 119.38965,114.05566 C 121.20214,114.05567 122.64745,114.50880 123.72559,115.41503 C 124.80370,116.32130 125.34276,117.53223 125.34277,119.04784 C 125.34276,119.76661 125.20604,120.45020 124.93262,121.09863 C 124.66698,121.73926 124.17870,122.49707 123.46777,123.37206 C 123.27245,123.59863 122.65136,124.25488 121.60449,125.34081 C 120.55761,126.41894 119.08105,127.93066 117.17480,129.87597 M 130.41699,128.89159 L 132.88965,128.89159 L 132.88965,131.86816 L 130.41699,131.86816 L 130.41699,128.89159 M 137.45996,114.37206 L 148.70996,114.37206 L 148.70996,115.37988 L 142.35840,131.86816 L 139.88574,131.86816 L 145.86230,116.36425 L 137.45996,116.36425 L 137.45996,114.37206"
+ id="text1326" />
</svg>
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 20667e6917..d302fbe501 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -5,10 +5,11 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r2"
+PR = "r4"
SRC_URI += "file://splash-p.svg file://splash-l.svg \
- file://c7x0-rotation.patch;patch=1"
+ file://c7x0-rotation.patch;patch=1 \
+ file://cairofix.patch;patch=1"
SRC_URI_append_mnci = " file://mnci.patch;patch=1"
FILES_${PN} += "${datadir}/gpe"
diff --git a/packages/gpe-login/gpe-login_0.83.bb b/packages/gpe-login/gpe-login_0.83.bb
new file mode 100644
index 0000000000..ec936f85df
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.83.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd"
+RPROVIDES = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI += "file://busybox-bad-perms.patch;patch=1"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
new file mode 100644
index 0000000000..243bbd1ba9
--- /dev/null
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -0,0 +1,14 @@
+inherit gpe
+
+DESCRIPTION = "GPE owner information dialog"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget"
+LICENSE = "GPL"
+PR = "r0"
+
+do_stage () {
+ oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
+ install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
+}
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
new file mode 100644
index 0000000000..31df65b281
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+
+
+LICENSE = "LGPL"
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/${PN}"
+PV = "0.102+cvs-${CVSDATE}"
+PR = "r0"
+
+inherit autotools pkgconfig
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/${PN}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+do_stage () {
+ autotools_stage_all
+
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch b/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
new file mode 100644
index 0000000000..899e31482c
--- /dev/null
+++ b/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
@@ -0,0 +1,25 @@
+--- SDL-1.2.7/configure.in~fixlibs 2005-10-06 10:27:59.025396872 +0200
++++ SDL-1.2.7/configure.in 2005-10-06 10:30:16.963087411 +0200
+@@ -1508,8 +1508,8 @@
+ AC_MSG_RESULT($video_qtopia)
+ if test x$video_qtopia = xyes; then
+ CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions"
+- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte"
+- SDL_CFLAGS="$SDL_CFLAGS -DQWS"
++ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib"
++ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte"
+ VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia"
+ VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la"
+ else
+@@ -1803,11 +1803,6 @@
+ CheckPTHREAD
+ CheckSIGACTION
+ CheckAltivec
+- # Set up files for the main() stub
+- if test "x$video_qtopia" = "xyes"; then
+- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
+-
+- fi
+ # Set up files for the audio library
+ # We use the OSS and ALSA API's, not the Sun audio API
+ #if test x$enable_audio = xyes; then
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb
index 54dc975fb5..a976f844eb 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.7.bb
@@ -16,12 +16,13 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://mouse.patch;patch=1 \
file://kill-stdc++.patch;patch=1 \
file://ipaq.patch;patch=1 \
- file://SDL-Akita.patch;patch=1"
+ file://SDL-Akita.patch;patch=1 \
+ file://fixlibs.patch;patch=1"
S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig
-EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
@@ -35,6 +36,7 @@ FILES_${PN}-dev += "${bindir}/*config"
do_stage() {
oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
+ rm ${STAGING_LIBDIR}/libSDL.la
ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
install -m 0655 src/main/libSDLmain.a src/main/.libs/
oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index 80c547b520..da96517041 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig
-EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
@@ -43,6 +43,7 @@ do_configure_append () {
do_stage() {
oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
+ rm ${STAGING_LIBDIR}/libSDL.la
ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
diff --git a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch b/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch
index 03d94d282c..51d7e0113f 100644
--- a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch
+++ b/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch
@@ -1,9 +1,37 @@
-# This patch fixes ixp4xx_copy_from for cases where the 'from'
-# pointer is odd - that would cause all the accesses to be
-# misaligned in the old code.
---- linux-2.6.12.2/.pc/ixp4xx_copy_from.patch/drivers/mtd/maps/ixp4xx.c 2005-09-21 22:35:38.761014739 -0700
-+++ linux-2.6.12.2/drivers/mtd/maps/ixp4xx.c 2005-09-23 01:27:54.696223365 -0700
-@@ -54,19 +54,23 @@
+--- linux-2.6.14-rc3/drivers/mtd/maps/ixp4xx.c 2005-10-05 20:35:42.916786530 -0700
++++ linux-2.6.14-rc3/drivers/mtd/maps/ixp4xx.c 2005-10-05 22:42:25.811206514 -0700
+@@ -30,18 +30,29 @@
+
+ #include <linux/reboot.h>
+
++/* On a little-endian IXP4XX system (tested on NSLU2) contrary to the
++ * Intel documentation LDRH/STRH appears to XOR the address with 10b.
++ * This causes the cfi commands (sent to the command address, 0xAA for
++ * 16 bit flash) to fail. This is fixed here by XOR'ing the address
++ * before use with 10b. The cost of this is that the flash layout ends
++ * up consistently big-endian, however this is not a problem as the
++ * access code consistently only accesses half words - so the endianness
++ * is not determinable.
++ */
+ #ifndef __ARMEB__
+ #define BYTE0(h) ((h) & 0xFF)
+ #define BYTE1(h) (((h) >> 8) & 0xFF)
++#define FLASHW(a) (*(__u16*)((u32)(a) ^ 2))
+ #else
+ #define BYTE0(h) (((h) >> 8) & 0xFF)
+ #define BYTE1(h) ((h) & 0xFF)
++#define FLASHW(a) (*(__u16*)(a))
+ #endif
+
+ static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs)
+ {
+ map_word val;
+- val.x[0] = *(__u16 *) (map->map_priv_1 + ofs);
++ val.x[0] = FLASHW(map->map_priv_1 + ofs);
+ return val;
+ }
+
+@@ -53,19 +64,23 @@
static void ixp4xx_copy_from(struct map_info *map, void *to,
unsigned long from, ssize_t len)
{
@@ -21,10 +49,10 @@
+ u8 *dest = (u8 *) to;
+ u8 *src = (u8 *) (map->map_priv_1 + from);
+ if (from & 1)
-+ *dest++ = BYTE1(*(u16 *)(src-1)), ++src, --len;
++ *dest++ = BYTE1(FLASHW(src-1)), ++src, --len;
+
+ while (len >= 2) {
-+ u16 data = *(u16 *)src; src += 2;
++ u16 data = FLASHW(src); src += 2;
+ *dest++ = BYTE0(data);
+ *dest++ = BYTE1(data);
+ len -= 2;
@@ -33,7 +61,25 @@
- if (len & 1)
- dest[len - 1] = BYTE0(src[i]);
+ if (len > 0)
-+ *dest++ = BYTE0(*(u16 *)src);
++ *dest++ = BYTE0(FLASHW(src));
}
/*
+@@ -75,7 +90,7 @@
+ static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long adr)
+ {
+ if (!(adr & 1))
+- *(__u16 *) (map->map_priv_1 + adr) = d.x[0];
++ FLASHW(map->map_priv_1 + adr) = d.x[0];
+ }
+
+ /*
+@@ -83,7 +98,7 @@
+ */
+ static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr)
+ {
+- *(__u16 *) (map->map_priv_1 + adr) = d.x[0];
++ FLASHW(map->map_priv_1 + adr) = d.x[0];
+ }
+
+ struct ixp4xx_flash_info {
diff --git a/packages/linux/nslu2-kernel/2.6.14/30-i2c-x1205.patch b/packages/linux/nslu2-kernel/2.6.14/30-i2c-x1205.patch
index c212238941..1e775ba8b8 100644
--- a/packages/linux/nslu2-kernel/2.6.14/30-i2c-x1205.patch
+++ b/packages/linux/nslu2-kernel/2.6.14/30-i2c-x1205.patch
@@ -1,13 +1,13 @@
---- linux-2.6.14-rc2/drivers/i2c/chips/Kconfig 2005-09-24 13:17:13.000000000 +0200
-+++ test3/drivers/i2c/chips/Kconfig 2005-09-24 16:09:51.000000000 +0200
-@@ -126,4 +126,14 @@
+diff -urN linux-2.6.14-rc3/drivers/i2c/chips/Kconfig test9/drivers/i2c/chips/Kconfig
+--- linux-2.6.14-rc3/drivers/i2c/chips/Kconfig 2005-10-01 13:46:50.000000000 +0200
++++ test9/drivers/i2c/chips/Kconfig 2005-10-03 16:10:22.000000000 +0200
+@@ -126,4 +126,13 @@
This driver can also be built as a module. If so, the module
will be called max6875.
+config SENSORS_X1205
+ tristate "Xicor X1205 RTC chip"
+ depends on I2C
-+ select I2C_SENSOR
+ help
+ If you say yes here you get support for the Xicor X1205 RTC chip.
+
@@ -15,8 +15,9 @@
+ will be called x1205
+
endmenu
---- linux-2.6.14-rc2/drivers/i2c/chips/Makefile 2005-09-17 12:42:33.000000000 +0200
-+++ test3/drivers/i2c/chips/Makefile 2005-09-24 16:49:34.000000000 +0200
+diff -urN linux-2.6.14-rc3/drivers/i2c/chips/Makefile test9/drivers/i2c/chips/Makefile
+--- linux-2.6.14-rc3/drivers/i2c/chips/Makefile 2005-09-17 12:42:33.000000000 +0200
++++ test9/drivers/i2c/chips/Makefile 2005-10-01 15:30:06.000000000 +0200
@@ -13,6 +13,7 @@
obj-$(CONFIG_SENSORS_RTC8564) += rtc8564.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
@@ -25,10 +26,10 @@
ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
EXTRA_CFLAGS += -DDEBUG
-diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x1205.c
---- linux-2.6.14-rc2/drivers/i2c/chips/x1205.c 1970-01-01 01:00:00.000000000 +0100
-+++ test3/drivers/i2c/chips/x1205.c 2005-09-24 16:11:16.000000000 +0200
-@@ -0,0 +1,522 @@
+diff -urN linux-2.6.14-rc3/drivers/i2c/chips/x1205.c test9/drivers/i2c/chips/x1205.c
+--- linux-2.6.14-rc3/drivers/i2c/chips/x1205.c 1970-01-01 01:00:00.000000000 +0100
++++ test9/drivers/i2c/chips/x1205.c 2005-10-03 16:02:57.000000000 +0200
+@@ -0,0 +1,612 @@
+/*
+ * linux/drivers/i2c/chips/x1205.c
+ *
@@ -62,7 +63,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+#define EPOCH_1900 1900
+#define EPOCH_1970 1970
+
-+#define DRIVER_VERSION "0.9.5"
++#define DRIVER_VERSION "0.9.6"
+#define DRIVER_NAME (x1205_driver.name)
+
+
@@ -140,20 +141,36 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
+ u8 reg_base)
+{
-+ static unsigned char addr[2] = { 0, };
-+ unsigned char buf[8];
++ static unsigned char dt_addr[] = { 0, };
++ static unsigned char sr_addr[] = { 0, };
+
-+ struct i2c_msg msgs[2] = {
-+ { client->addr, 0, 2, addr }, /* random read */
++ unsigned char buf[8], sr;
++
++ struct i2c_msg msgs[] = {
++ { client->addr, 0, 2, sr_addr }, /* random read */
++ { client->addr, I2C_M_RD, 1, &sr },
++ { client->addr, 0, 2, dt_addr }, /* random read */
+ { client->addr, I2C_M_RD, 8, buf },
+ };
+
+ struct x1205_data *xdata = i2c_get_clientdata(client);
+
-+ addr[1] = reg_base;
++ dt_addr[1] = reg_base;
++ sr_addr[1] = X1205_REG_SR;
++
++ if ((i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs))) ==
++ ARRAY_SIZE(msgs)) {
++ /* did we read the correct number of messages? */
+
-+ if ((i2c_transfer(client->adapter, msgs, 2)) == 2) {
-+ /* did we read 2 messages? */
++ /* check for battery failure */
++ if (sr & X1205_SR_RTCF)
++ {
++ dev_info(&client->adapter->dev,
++ "%s: Clock had a power failure, you must set the date.\n",
++ DRIVER_NAME);
++
++ return -EINVAL;
++ }
+
+ dev_dbg(&client->dev,
+ "%s: raw read data - sec-%02x min-%02x hr-%02x"
@@ -318,6 +335,14 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ return 0;
+}
+
++struct x1205_limit
++{
++ unsigned char reg;
++ unsigned char mask;
++ unsigned char min;
++ unsigned char max;
++};
++
+static int x1205_validate_client(struct i2c_client *client)
+{
+ int i, xfer;
@@ -326,7 +351,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ * address and check if the given bits are zero.
+ */
+
-+ const unsigned char probe_pattern[] = {
++ const unsigned char probe_zero_pattern[] = {
+
+ X1205_REG_SR, 0x18,
+ X1205_REG_Y2K, 0xC6,
@@ -337,7 +362,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ X1205_REG_MN, 0x80,
+ X1205_REG_SC, 0x80,
+ X1205_REG_DTR, 0xF8,
-+ X1205_REG_ATR, 0x18,
++ X1205_REG_ATR, 0xC0,
+ X1205_REG_INT, 0x18,
+ X1205_REG_0, 0xFF,
+ X1205_REG_Y2K1, 0xC6,
@@ -352,7 +377,35 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ X1205_REG_HRA0, 0x40,
+ };
+
-+ for (i = 0; i < sizeof(probe_pattern); i += 2)
++ const struct x1205_limit probe_limits_pattern[] = {
++ /* register, mask, min, max */
++ { X1205_REG_Y2K, 0xFF, 19, 20 },
++ { X1205_REG_DW, 0xFF, 0, 6 },
++ { X1205_REG_YR, 0xFF, 0, 99 },
++ { X1205_REG_MO, 0xFF, 0, 12 },
++ { X1205_REG_DT, 0xFF, 0, 31 },
++ { X1205_REG_HR, 0x7F, 0, 23 },
++ { X1205_REG_MN, 0xFF, 0, 59 },
++ { X1205_REG_SC, 0xFF, 0, 59 },
++ { X1205_REG_Y2K1, 0xFF, 19, 20 },
++ { X1205_REG_DWA1, 0x7F, 0, 6 },
++ { X1205_REG_MOA1, 0x7F, 0, 12 },
++ { X1205_REG_DTA1, 0x7F, 0, 31 },
++ { X1205_REG_HRA1, 0x7F, 0, 23 },
++ { X1205_REG_MNA1, 0x7F, 0, 59 },
++ { X1205_REG_SCA1, 0x7F, 0, 59 },
++ { X1205_REG_Y2K0, 0xFF, 19, 20 },
++ { X1205_REG_DWA0, 0x7F, 0, 6 },
++ { X1205_REG_MOA0, 0x7F, 0, 12 },
++ { X1205_REG_DTA0, 0x7F, 0, 31 },
++ { X1205_REG_HRA0, 0x7F, 0, 23 },
++ { X1205_REG_MNA0, 0x7F, 0, 59 },
++ { X1205_REG_SCA0, 0x7F, 0, 59 },
++ };
++
++ /* check that registers have bits a 0 where expected */
++
++ for (i = 0; i < ARRAY_SIZE(probe_zero_pattern); i += 2)
+ {
+ unsigned char buf;
+
@@ -364,7 +417,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ };
+
+ addr[0] = 0x00;
-+ addr[1] = probe_pattern[i];
++ addr[1] = probe_zero_pattern[i];
+
+ xfer = i2c_transfer(client->adapter, msgs, 2);
+
@@ -376,15 +429,53 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+ return -EIO;
+ }
+
-+ if ((buf & probe_pattern[i+1]) != 0) {
++ if ((buf & probe_zero_pattern[i+1]) != 0) {
+ dev_dbg(&client->adapter->dev,
-+ "%s: register %x, pattern %d: %x\n",
++ "%s: register %x, zero pattern %d: %x\n",
+ __FUNCTION__, addr[1], i, buf);
+
+ return -ENODEV;
+ }
+ }
+
++ /* check limits */
++
++ for (i = 0; i < ARRAY_SIZE(probe_limits_pattern); i++)
++ {
++ unsigned char buf, val;
++
++ static unsigned char addr[2];
++
++ struct i2c_msg msgs[2] = {
++ { client->addr, 0, 2, addr }, /* random read */
++ { client->addr, I2C_M_RD, 1, &buf },
++ };
++
++ addr[0] = 0x00;
++ addr[1] = probe_limits_pattern[i].reg;
++
++ xfer = i2c_transfer(client->adapter, msgs, 2);
++
++ if (xfer != 2) {
++ dev_dbg(&client->adapter->dev,
++ "%s: could not read register %x\n",
++ __FUNCTION__, addr[1]);
++
++ return -EIO;
++ }
++
++ val = BCD2BIN(buf & probe_limits_pattern[i].mask);
++
++ if (val > probe_limits_pattern[i].max ||
++ val < probe_limits_pattern[i].min) {
++ dev_dbg(&client->adapter->dev,
++ "%s: register %x, lim pattern %d: %d\n",
++ __FUNCTION__, addr[1], i, val);
++
++ return -ENODEV;
++ }
++ }
++
+ return 0;
+}
+
@@ -444,7 +535,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+
+ list_add(&xdata->list, &x1205_clients);
+
-+ dev_info(&adapter->dev, "%s: chip found, driver " DRIVER_VERSION "\n",
++ dev_info(&adapter->dev, "%s: Chip found, driver " DRIVER_VERSION "\n",
+ DRIVER_NAME);
+
+ /* If requested, se the system time */
@@ -551,9 +642,9 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+
+module_init(x1205_init);
+module_exit(x1205_exit);
---- linux-2.6.14-rc2/include/linux/x1205.h 1970-01-01 01:00:00.000000000 +0100
-+++ test3/include/linux/x1205.h 2005-09-24 16:59:28.000000000 +0200
-@@ -0,0 +1,66 @@
+--- linux-2.6.14-rc3/include/linux/x1205.h 1970-01-01 01:00:00.000000000 +0100
++++ test9/include/linux/x1205.h 2005-10-03 15:38:21.000000000 +0200
+@@ -0,0 +1,67 @@
+
+/* commands */
+
@@ -613,6 +704,7 @@ diff -urN linux-2.6.14-rc2/drivers/i2c/chips/x1205.c test3/drivers/i2c/chips/x12
+#define X1205_CCR_BASE 0x30 /* Base address of CCR */
+#define X1205_ALM0_BASE 0x00 /* Base address of ALARM0 */
+
++#define X1205_SR_RTCF 0x01
+#define X1205_SR_WEL 0x02 /* Write Enable Latch bit */
+#define X1205_SR_RWEL 0x04 /* Register Write Enable Bit */
+
diff --git a/packages/linux/nslu2-kernel/2.6.14/50-nslu2-general.patch b/packages/linux/nslu2-kernel/2.6.14/50-nslu2-general.patch
index c5b513c5e1..c0c8d51731 100644
--- a/packages/linux/nslu2-kernel/2.6.14/50-nslu2-general.patch
+++ b/packages/linux/nslu2-kernel/2.6.14/50-nslu2-general.patch
@@ -1,15 +1,18 @@
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/Makefile 2005-09-17 12:42:02.000000000 +0200
-+++ test6/arch/arm/mach-ixp4xx/Makefile 2005-09-28 21:58:36.000000000 +0200
-@@ -8,4 +8,6 @@
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/Makefile 2005-09-17 12:42:02.000000000 +0200
++++ test14/arch/arm/mach-ixp4xx/Makefile 2005-10-06 21:29:53.000000000 +0200
+@@ -8,4 +8,9 @@
obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o
+obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-rtc.o nslu2-io.o
+
++leds-$(CONFIG_MACH_NSLU2) += nslu2-leds.o
++obj-$(CONFIG_LEDS) += $(leds-y)
++
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/nslu2-rtc.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/arch/arm/mach-ixp4xx/nslu2-rtc.c 2005-09-28 03:02:42.000000000 +0200
-@@ -0,0 +1,108 @@
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-rtc.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-rtc.c 2005-10-06 21:29:53.000000000 +0200
+@@ -0,0 +1,113 @@
+/*
+ * arch/arm/mach-ixp4xx/nslu2-rtc.c
+ *
@@ -37,7 +40,7 @@
+#include <linux/x1205.h>
+
+#include <asm/rtc.h>
-+
++#include <asm/mach-types.h>
+
+extern int (*set_rtc)(void);
+
@@ -99,9 +102,14 @@
+
+static int __init nslu2_rtc_init(void)
+{
-+ int ret = register_rtc(&rtc_ops);
++ int ret;
+
-+ if (ret)
++ if (!(machine_is_nslu2()))
++ return 0;
++
++ printk(KERN_INFO "NSLU2: rtc\n");
++
++ if ((ret = register_rtc(&rtc_ops)) != 0)
+ return ret;
+
+ set_rtc = nslu2_set_rtc;
@@ -118,9 +126,9 @@
+
+module_init(nslu2_rtc_init);
+module_exit(nslu2_rtc_exit);
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/arch/arm/mach-ixp4xx/nslu2-io.c 2005-09-28 22:02:12.000000000 +0200
-@@ -0,0 +1,540 @@
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-io.c 2005-10-06 21:29:53.000000000 +0200
+@@ -0,0 +1,548 @@
+//=============================================================================
+//
+// n2-io.c version 0.1.7
@@ -172,6 +180,7 @@
+#define NSLU2BZ_MAJOR 62 //buzzer
+#define NSLU2LM_MAJOR 126
+
++
+#define NSLU2_BEEP_DUR_LONG 2000
+#define NSLU2_BEEP_DUR_MED 400
+#define NSLU2_BEEP_DUR_SHORT 100
@@ -180,7 +189,7 @@
+#define NSLU2_BEEP_PITCH_LOW 1000
+#define NSLU2_LONG_DELAY 30000
+
-+
++#define NSLU2_BZ_BM (1L << NSLU2_GPIO_BUZZ)
+
+// ioctls -- 'M" is used for sound cards...we don't got one so it seems safe
+
@@ -241,7 +250,6 @@
+#define LED_DISK2 3
+#define LED_ALL 4
+
-+static unsigned long init_jiffy = 0; /* jiffies at init time */
+static unsigned long ontime = 50;
+static unsigned long offtime = 450;
+static unsigned long bz_repeatcnt = 10;
@@ -264,6 +272,7 @@
+//
+//==================================================================================================
+// this blinks rs green or green/yellow if rs red is on
++#ifndef CONFIG_LEDS
+static void n2lm_rsg_handler(unsigned long data)
+{
+ *IXP4XX_GPIO_GPOUTR ^= RS_GRN_TGL; //flip the led
@@ -475,6 +484,7 @@
+ .owner = THIS_MODULE,
+ .ioctl = n2lm_ioctl,
+};
++#endif
+//==================================================================================================
+// We can't do anything fancy here since the system tick rate is far below that required to
+// generate a desirable tone. Therefore we haven't much choice but to use a busy loop until
@@ -577,29 +587,34 @@
+
+static void n2iom_initarch(void)
+{
-+ printk(KERN_DEBUG "setup_interrupts - jiffies=%ld init_jiffy=%ld\n", jiffies, init_jiffy);
-+
++#ifndef CONFIG_LEDS
+ init_timer(&n2lm_rsg_timer);
+ init_timer(&n2lm_rsr_timer);
+ init_timer(&n2lm_d1_timer);
+ init_timer(&n2lm_d2_timer);
-+ init_timer(&n2bz_timer);
+
+ n2lm_rsr_timer.function = n2lm_rsr_handler;
+ n2lm_rsg_timer.function = n2lm_rsg_handler;
+ n2lm_d2_timer.function = n2lm_d2_handler;
+ n2lm_d1_timer.function = n2lm_d1_handler;
++#endif
++
++ init_timer(&n2bz_timer);
+ n2bz_timer.function = n2bz_handler;
++
+ n2lm_rsr_timer.data = n2lm_rsg_timer.data = n2lm_d1_timer.data = n2lm_d2_timer.data = n2bz_timer.data = 0;
+
++#ifndef CONFIG_LEDS
+ *IXP4XX_GPIO_GPOER &= 0xfffffff0; //enable gpio 0-3
+ *IXP4XX_GPIO_GPOUTR |= 0x00000003; //turn off the leds
+ *IXP4XX_GPIO_GPOUTR &= 0xfffffffc;
+ n2lm_ledon(LED_ALL);
+ n2_buzz(NSLU2_BEEP_PITCH_MED, NSLU2_BEEP_DUR_SHORT);
+ n2lm_ledoff(LED_ALL);
-+// Default the Ready/Status to Red during kernel boot, Turn Green at the end of sysvinit
++
++ // Default the Ready/Status to Red during kernel boot, Turn Green at the end of sysvinit
+ n2lm_ledon(LED_RS_RED);
++#endif
+
+ return;
+}
@@ -608,14 +623,13 @@
+
+static int __init n2iom_init(void)
+{
-+ printk(KERN_INFO "NSLU2 I/O driver %s\n", VERSION);
++ printk(KERN_INFO "NSLU2: i/o, %s\n", VERSION);
+
-+ init_jiffy = jiffies;
-+ printk(KERN_DEBUG "init_jiffy=%ld\n",init_jiffy);
+ n2iom_initarch();
+
+ n2lm_class = class_create(THIS_MODULE, "nslu2");
+
++#ifndef CONFIG_LEDS
+ if (register_chrdev(NSLU2LM_MAJOR, "n2_ledm", &n2lm_fops) < 0) {
+ printk(KERN_DEBUG "Led Manager Major %d not available\n", NSLU2LM_MAJOR);
+ return -EBUSY;
@@ -623,6 +637,8 @@
+ else {
+ class_device_create(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0), NULL, "leds");
+ }
++#endif
++
+ if (register_chrdev(NSLU2BZ_MAJOR, "n2_bzm", &n2bz_fops) < 0) {
+ printk(KERN_DEBUG "Buzzer Major %d not available\n", NSLU2BZ_MAJOR);
+ return -EBUSY;
@@ -638,6 +654,8 @@
+
+static void __exit n2iom_exit(void)
+{
++
++#ifndef CONFIG_LEDS
+ del_timer(&n2lm_rsg_timer);
+ del_timer(&n2lm_rsr_timer);
+ del_timer(&n2lm_d1_timer);
@@ -645,6 +663,7 @@
+
+ unregister_chrdev(NSLU2LM_MAJOR, "n2lm" );
+ class_device_destroy(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0));
++#endif
+
+ unregister_chrdev(NSLU2BZ_MAJOR, "n2bz");
+ class_device_destroy(n2lm_class, MKDEV(NSLU2BZ_MAJOR, 0));
@@ -652,18 +671,15 @@
+ class_destroy(n2lm_class);
+}
+
-+module_init (n2iom_init);
-+module_exit (n2iom_exit);
++module_init(n2iom_init);
++module_exit(n2iom_exit);
+
+MODULE_AUTHOR("Karen Spearel <kas11@tampabay.rr.com>");
+MODULE_DESCRIPTION("NSLU2 I/O driver");
+MODULE_LICENSE("GPL");
-+static int debug = 7;
-+module_param(debug, int, 0644);
-+MODULE_PARM_DESC(debug, "Debugging enabled = 8");
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/arch/arm/mach-ixp4xx/nslu2-setup.c 2005-09-27 20:19:14.000000000 +0200
-@@ -0,0 +1,131 @@
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-setup.c 2005-10-06 21:29:53.000000000 +0200
+@@ -0,0 +1,134 @@
+/*
+ * arch/arm/mach-ixp4xx/nslu2-setup.c
+ *
@@ -771,8 +787,11 @@
+{
+ /* This causes the box to drop the power and go dead. */
+
-+ *IXP4XX_GPIO_GPOER &= ~NSLU2_PO_BM; /* enable the pwr cntl gpio */
-+ *IXP4XX_GPIO_GPOUTR |= NSLU2_PO_BM; /* do the deed */
++ /* enable the pwr cntl gpio */
++ gpio_line_config(NSLU2_PO_GPIO, IXP4XX_GPIO_OUT);
++
++ /* do the deed */
++ gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
+}
+
+static void __init nslu2_init(void)
@@ -795,8 +814,8 @@
+ .timer = &ixp4xx_timer,
+ .init_machine = nslu2_init,
+MACHINE_END
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/nslu2-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/arch/arm/mach-ixp4xx/nslu2-pci.c 2005-09-27 20:19:14.000000000 +0200
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-pci.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-pci.c 2005-10-06 21:29:53.000000000 +0200
@@ -0,0 +1,78 @@
+/*
+ * arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -876,9 +895,9 @@
+}
+
+subsys_initcall(nslu2_pci_init);
---- linux-2.6.14-rc2/arch/arm/mach-ixp4xx/nslu2-power.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/arch/arm/mach-ixp4xx/nslu2-power.c 2005-09-28 03:03:11.000000000 +0200
-@@ -0,0 +1,98 @@
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-power.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-power.c 2005-10-06 21:39:43.000000000 +0200
+@@ -0,0 +1,92 @@
+/*
+ * arch/arm/mach-ixp4xx/nslu2-power.c
+ *
@@ -902,17 +921,12 @@
+#include <linux/reboot.h>
+#include <linux/interrupt.h>
+
-+static int nslu2_shutdown_in_progress = 0;
++#include <asm/mach-types.h>
+
+static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
-+ /* FIXME init will start a shutdown but the machine
-+ * will actually reboot at the end
-+ */
-+
-+ if (!nslu2_shutdown_in_progress++) {
-+ kill_proc(1, SIGINT, 1); /* Signal init to shut down */
-+ }
++ /* Signal init to do the ctrlaltdel action */
++ kill_proc(1, SIGINT, 1);
+
+ return IRQ_HANDLED;
+}
@@ -930,7 +944,10 @@
+
+static int __init nslu2_power_init(void)
+{
-+ printk(KERN_INFO "NSLU2 Power/Reset\n");
++ if (!(machine_is_nslu2()))
++ return 0;
++
++ printk(KERN_INFO "NSLU2: power/reset\n");
+
+ *IXP4XX_GPIO_GPISR = 0x20400000; /* read the 2 irqs to clr */
+
@@ -940,9 +957,8 @@
+ gpio_line_isr_clear(NSLU2_RB_GPIO);
+ gpio_line_isr_clear(NSLU2_PB_GPIO);
+
-+
+ if (request_irq(NSLU2_RB_IRQ, &nslu2_reset_handler,
-+ SA_INTERRUPT, "NSLU2 reset button", NULL) < 0) {
++ SA_INTERRUPT, "NSLU2 reset button", NULL) < 0) {
+
+ printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
+ NSLU2_RB_IRQ);
@@ -951,16 +967,13 @@
+ }
+
+ if (request_irq(NSLU2_PB_IRQ, &nslu2_power_handler,
-+ SA_INTERRUPT, "NSLU2 power button", NULL) < 0) {
++ SA_INTERRUPT, "NSLU2 power button", NULL) < 0) {
+
+ printk(KERN_DEBUG "Power Button IRQ %d not available\n",
+ NSLU2_PB_IRQ);
+
+ return -EIO;
+ }
-+
-+ enable_irq(NSLU2_PB_IRQ);
-+ enable_irq(NSLU2_RB_IRQ);
+
+ return 0;
+}
@@ -971,15 +984,15 @@
+ free_irq(NSLU2_PB_IRQ, NULL);
+}
+
-+module_init (nslu2_power_init);
-+module_exit (nslu2_power_exit);
++module_init(nslu2_power_init);
++module_exit(nslu2_power_exit);
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("NSLU2 Power/Reset driver");
+MODULE_LICENSE("GPL");
---- linux-2.6.14-rc2/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 01:00:00.000000000 +0100
-+++ test6/include/asm-arm/arch-ixp4xx/nslu2.h 2005-09-27 20:39:35.000000000 +0200
-@@ -0,0 +1,59 @@
+--- linux-2.6.14-rc3/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 01:00:00.000000000 +0100
++++ test14/include/asm-arm/arch-ixp4xx/nslu2.h 2005-10-06 21:29:53.000000000 +0200
+@@ -0,0 +1,96 @@
+/*
+ * include/asm-arm/arch-ixp4xx/nslu2.h
+ *
@@ -1027,15 +1040,309 @@
+
+/* GPIO */
+
-+#define NSLU2_BZ_GPIO 4
-+#define NSLU2_PB_GPIO 5
-+#define NSLU2_PO_GPIO 8 /* power off */
-+#define NSLU2_RB_GPIO 12
++#define NSLU2_GPIO0 0
++#define NSLU2_GPIO1 1
++#define NSLU2_GPIO2 2
++#define NSLU2_GPIO3 3
++#define NSLU2_GPIO4 4
++#define NSLU2_GPIO5 5
++#define NSLU2_GPIO6 6
++#define NSLU2_GPIO7 7
++#define NSLU2_GPIO8 8
++#define NSLU2_GPIO9 9
++#define NSLU2_GPIO10 10
++#define NSLU2_GPIO11 11
++#define NSLU2_GPIO12 12
++#define NSLU2_GPIO13 13
++#define NSLU2_GPIO14 14
++#define NSLU2_GPIO15 15
++
++/* Buttons */
++
++#define NSLU2_PB_GPIO NSLU2_GPIO5
++#define NSLU2_PO_GPIO NSLU2_GPIO8 /* power off */
++#define NSLU2_RB_GPIO NSLU2_GPIO12
++
++#define NSLU2_PB_IRQ IRQ_IXP4XX_GPIO5
++#define NSLU2_RB_IRQ IRQ_IXP4XX_GPIO12
++
++#define NSLU2_PB_BM (1L << NSLU2_PB_GPIO)
++#define NSLU2_PO_BM (1L << NSLU2_PO_GPIO)
++#define NSLU2_RB_BM (1L << NSLU2_RB_GPIO)
++
++/* Buzzer */
++
++#define NSLU2_GPIO_BUZZ 4
++#define NSLU2_BZ_BM (1L << NSLU2_GPIO_BUZZ)
++/* LEDs */
++
++#define NSLU2_LED_RED NSLU2_GPIO0
++#define NSLU2_LED_GRN NSLU2_GPIO1
++
++#define NSLU2_LED_RED_BM (1L << NSLU2_LED_RED)
++#define NSLU2_LED_GRN_BM (1L << NSLU2_LED_GRN)
++
++#define NSLU2_LED_DISK1 NSLU2_GPIO2
++#define NSLU2_LED_DISK2 NSLU2_GPIO3
++
++#define NSLU2_LED_DISK1_BM (1L << NSLU2_GPIO2)
++#define NSLU2_LED_DISK2_BM (1L << NSLU2_GPIO3)
++
++
+--- linux-2.6.14-rc3/arch/arm/Kconfig 2005-10-01 13:46:47.000000000 +0200
++++ test14/arch/arm/Kconfig 2005-10-06 21:29:53.000000000 +0200
+@@ -389,7 +389,8 @@
+ ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
+ ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
+ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
+- ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE
++ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
++ MACH_NSLU2
+ help
+ If you say Y here, the LEDs on your machine will be used
+ to provide useful information about your current system status.
+@@ -403,7 +404,7 @@
+
+ config LEDS_TIMER
+ bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
+- MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
++ MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || MACH_NSLU2
+ depends on LEDS
+ default y if ARCH_EBSA110
+ help
+@@ -419,7 +420,8 @@
+
+ config LEDS_CPU
+ bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
+- !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
++ !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 \
++ || MACH_NSLU2
+ depends on LEDS
+ help
+ If you say Y here, the red LED will be used to give a good real
+--- linux-2.6.14-rc3/arch/arm/mach-ixp4xx/nslu2-leds.c 1970-01-01 01:00:00.000000000 +0100
++++ test14/arch/arm/mach-ixp4xx/nslu2-leds.c 2005-10-06 21:29:53.000000000 +0200
+@@ -0,0 +1,223 @@
++/*
++ * arch/arm/mach-ixp4xx/nslu2-leds.c
++ *
++ * NSLU2 LEDs driver
++ *
++ * Copyright (C) 2005 Tower Technologies
++ *
++ * based on nslu2-io.c
++ * Copyright (C) 2004 Karen Spearel
++ * and arch/arm/mach-footbridge/netwinder-leds.c
++ * Copyright (C) 1998-1999 Russell King
++ *
++ * Author: Alessandro Zummo <a.zummo@towertech.it>
++ * Maintainers: http://www.nslu2-linux.org/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/spinlock.h>
++#include <linux/notifier.h>
++
++#include <asm/hardware.h>
++#include <asm/leds.h>
++#include <asm/mach-types.h>
++#include <asm/system.h>
++
++#define LED_STATE_ENABLED 0x01
++#define LED_STATE_CLAIMED 0x02
++#define LED_STATE_IDLE 0x04
++
++static unsigned char led_state;
++static unsigned int hw_led_state;
++
++static const unsigned long idle_seq[4] = {
++
++ NSLU2_LED_GRN_BM, 0,
++ NSLU2_LED_GRN_BM, 0,
++};
++
++static const unsigned long busy_seq[4] = {
++
++ NSLU2_LED_GRN_BM, 0,
++ NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM, 0,
++};
++
++static unsigned char led_count = 0;
++
++static DEFINE_SPINLOCK(leds_lock);
++extern spinlock_t gpio_lock;
++
++static void nslu2_leds_event(led_event_t evt)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&leds_lock, flags);
++
++ switch (evt) {
++ case led_start:
++ /* Let's rock! Red led on, all others off. Remember
++ * that disk1/disk2 works inverted. On the NSLU2, the
++ * interface starts in a claimed state. XXX
++ */
++ led_state = LED_STATE_ENABLED | LED_STATE_CLAIMED;
++ hw_led_state = NSLU2_LED_DISK1_BM | NSLU2_LED_DISK2_BM
++ | NSLU2_LED_RED_BM;
++ break;
++
++ case led_stop:
++ led_state &= ~LED_STATE_ENABLED;
++ break;
++
++ case led_claim:
++ /* The user claimed the interface, red and green off */
++ led_state |= LED_STATE_CLAIMED;
++ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM);
++ break;
++
++ case led_release:
++ /* The user released the interface, preserve the last
++ * status of the leds, except red/green.
++ */
++ led_state &= ~LED_STATE_CLAIMED;
++ hw_led_state = *IXP4XX_GPIO_GPOUTR & 0x0000000C;
++ break;
++
++#ifdef CONFIG_LEDS_TIMER
++ case led_timer:
++ /* Pulse green led */
++ if (!(led_state & LED_STATE_CLAIMED))
++ {
++ /* clear red and green bits */
++ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM);
++
++ /* copy the right sequence in */
++ if (led_state & LED_STATE_IDLE)
++ hw_led_state |= idle_seq[led_count % 4];
++ else
++ hw_led_state |= busy_seq[led_count % 4];
++
++ led_count++;
++ }
++ break;
++#endif
++
++#ifdef CONFIG_LEDS_CPU
++
++ case led_idle_start:
++ led_state |= LED_STATE_IDLE;
++#ifndef CONFIG_LEDS_TIMER
++ /* green on, red off */
++ hw_led_state |= NSLU2_LED_GRN_BM;
++ hw_led_state &= ~NSLU2_LED_RED_BM;
++#endif
++ break;
++
++ case led_idle_end:
++ led_state &= ~LED_STATE_IDLE;
++#ifndef CONFIG_LEDS_TIMER
++ /* green on, red on -> amber on */
++ hw_led_state |= NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM;
++#endif
++ break;
++#endif
++
++ case led_halted:
++ if (!(led_state & LED_STATE_CLAIMED))
++ hw_led_state |= NSLU2_LED_RED_BM;
++ break;
++
++ /* leds */
++
++ case led_green_on:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state |= NSLU2_LED_GRN_BM;
++ break;
++
++ case led_green_off:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state &= ~NSLU2_LED_GRN_BM;
++ break;
++
++ case led_amber_on:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state |= (NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM);
++ break;
++
++ case led_amber_off:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM);
++ break;
++
++ case led_red_on:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state |= NSLU2_LED_RED_BM;
++ break;
++
++ case led_red_off:
++ if (led_state & LED_STATE_CLAIMED)
++ hw_led_state &= ~NSLU2_LED_RED_BM;
++ break;
++
++ default:
++ break;
++ }
++
++ spin_unlock_irqrestore(&leds_lock, flags);
++
++ if (led_state & LED_STATE_ENABLED) {
++ spin_lock_irqsave(&gpio_lock, flags);
++ *IXP4XX_GPIO_GPOUTR = (*IXP4XX_GPIO_GPOUTR & 0xFFFFFFF0) | hw_led_state;
++ spin_unlock_irqrestore(&gpio_lock, flags);
++ }
++}
++
++static int nslu2_leds_panic_event(struct notifier_block *this, unsigned long event,
++ void *ptr)
++{
++ leds_event(led_green_off);
++ leds_event(led_red_on);
++
++ return NOTIFY_DONE;
++}
++
++static struct notifier_block nslu2_leds_panic_block = {
++ .notifier_call = nslu2_leds_panic_event,
++};
++
++static int __init nslu2_leds_init(void)
++{
++ if (!(machine_is_nslu2()))
++ return 0;
++
++ printk(KERN_INFO "NSLU2: leds\n");
++
++ /* register panic notifier */
++ notifier_chain_register(&panic_notifier_list, &nslu2_leds_panic_block);
++
++ /* enable gpio 0-3 */
++ gpio_line_config(NSLU2_LED_GRN, IXP4XX_GPIO_OUT);
++ gpio_line_config(NSLU2_LED_RED, IXP4XX_GPIO_OUT);
++ gpio_line_config(NSLU2_LED_DISK1, IXP4XX_GPIO_OUT);
++ gpio_line_config(NSLU2_LED_DISK2, IXP4XX_GPIO_OUT);
++
++ leds_event = nslu2_leds_event;
++
++ /* this will also initialize the leds to the
++ * default state.
++ */
++
++ leds_event(led_start);
++
++ return 0;
++}
+
-+#define NSLU2_PB_IRQ 22 /* gpio5 */
-+#define NSLU2_RB_IRQ 29 /* gpio12 */
++module_init(nslu2_leds_init);
+
-+#define NSLU2_BZ_BM 0x0010 /* b0000 0000 0001 0000 */
-+#define NSLU2_PB_BM 0x0020 /* b0000 0000 0010 0000 */
-+#define NSLU2_PO_BM 0x0100 /* b0000 0001 0000 0000 */
-+#define NSLU2_RB_BM 0x1000 /* b0001 0000 0000 0000 */
diff --git a/packages/linux/nslu2-kernel/2.6.14/50-nslu2-beeper.patch b/packages/linux/nslu2-kernel/2.6.14/60-nslu2-beeper.patch
index cf2de14c68..1ef9b6bb37 100644
--- a/packages/linux/nslu2-kernel/2.6.14/50-nslu2-beeper.patch
+++ b/packages/linux/nslu2-kernel/2.6.14/60-nslu2-beeper.patch
@@ -1,6 +1,6 @@
-diff -urN linux-2.6.14-rc2/drivers/input/misc/Kconfig test6/drivers/input/misc/Kconfig
---- linux-2.6.14-rc2/drivers/input/misc/Kconfig 2005-09-17 12:42:09.000000000 +0200
-+++ test6/drivers/input/misc/Kconfig 2005-09-28 19:24:52.000000000 +0200
+diff -urN -X linux-2.6.14-rc3/Documentation/dontdiff linux-2.6.14-rc3/drivers/input/misc/Kconfig test12/drivers/input/misc/Kconfig
+--- linux-2.6.14-rc3/drivers/input/misc/Kconfig 2005-09-17 12:42:09.000000000 +0200
++++ test12/drivers/input/misc/Kconfig 2005-10-03 23:26:15.000000000 +0200
@@ -40,6 +40,18 @@
tristate "M68k Beeper support"
depends on M68K
@@ -20,18 +20,18 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/Kconfig test6/drivers/input/misc/K
config INPUT_UINPUT
tristate "User level driver support"
help
-diff -urN linux-2.6.14-rc2/drivers/input/misc/Makefile test6/drivers/input/misc/Makefile
---- linux-2.6.14-rc2/drivers/input/misc/Makefile 2005-09-17 12:42:09.000000000 +0200
-+++ test6/drivers/input/misc/Makefile 2005-09-28 17:01:19.000000000 +0200
+diff -urN -X linux-2.6.14-rc3/Documentation/dontdiff linux-2.6.14-rc3/drivers/input/misc/Makefile test12/drivers/input/misc/Makefile
+--- linux-2.6.14-rc3/drivers/input/misc/Makefile 2005-09-17 12:42:09.000000000 +0200
++++ test12/drivers/input/misc/Makefile 2005-10-03 23:26:15.000000000 +0200
@@ -10,3 +10,4 @@
obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
+obj-$(CONFIG_INPUT_NSLU2_BEEPER) += nslu2spkr.o
-diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/misc/nslu2spkr.c
---- linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c 1970-01-01 01:00:00.000000000 +0100
-+++ test6/drivers/input/misc/nslu2spkr.c 2005-09-28 19:23:34.000000000 +0200
-@@ -0,0 +1,110 @@
+diff -urN -X linux-2.6.14-rc3/Documentation/dontdiff linux-2.6.14-rc3/drivers/input/misc/nslu2spkr.c test12/drivers/input/misc/nslu2spkr.c
+--- linux-2.6.14-rc3/drivers/input/misc/nslu2spkr.c 1970-01-01 01:00:00.000000000 +0100
++++ test12/drivers/input/misc/nslu2spkr.c 2005-10-05 03:06:20.000000000 +0200
+@@ -0,0 +1,144 @@
+/*
+ * drivers/input/misc/nslu2spkr.c
+ *
@@ -52,13 +52,17 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+ */
+
+#include <linux/config.h>
-+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
++#include <linux/delay.h>
+
-+#include <asm/arch/nslu2.h>
-+#include <asm-arm/delay.h>
++#include <asm/hardware.h>
++#include <asm/irq.h>
++
++static unsigned int beep_on_startup = 1;
++module_param(beep_on_startup, bool, 0);
++MODULE_PARM_DESC(beep_on_startup, "Play a beep on module startup");
+
+DEFINE_SPINLOCK(beep_lock);
+
@@ -72,7 +76,7 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+
+ switch (code) {
+ case SND_BELL:
-+ if (value) value = 5000;
++ if (value) value = 1000;
+ case SND_TONE:
+ break;
+ default:
@@ -80,23 +84,24 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+ }
+
+ if (value > 20 && value < 32767)
-+ count = 1193182 / value;
++ count = (NSLU2_FREQ / (value*4)) - 1;
+
+ spin_lock_irqsave(&beep_lock, flags);
+
-+ *IXP4XX_GPIO_GPOER &= ~NSLU2_BZ_BM;
++ if (count) {
+
-+ while (count) {
-+ *IXP4XX_GPIO_GPOUTR &= ~NSLU2_BZ_BM;
-+ udelay(500);
++ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_OUT);
++ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_LOW);
+
-+ *IXP4XX_GPIO_GPOUTR |= NSLU2_BZ_BM;
-+ udelay(500);
++ *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE;
+
-+ count--;
-+ }
++ } else {
+
-+ *IXP4XX_GPIO_GPOER |= NSLU2_BZ_BM;
++ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_IN);
++ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_HIGH);
++
++ *IXP4XX_OSRT2 = 0;
++ }
+
+ spin_unlock_irqrestore(&beep_lock, flags);
+
@@ -104,10 +109,10 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+}
+
+static struct input_dev nslu2_spkr_dev = {
-+ .phys = "nslu2/gpio4",
++ .phys = "ixp420/gpio4",
+ .name = "NSLU2 Beeper",
+ .evbit[0] = BIT(EV_SND),
-+ .sndbit[0] = BIT(SND_BELL),
++ .sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE),
+ .event = nslu2_spkr_event,
+ .id = {
+ .bustype = BUS_HOST,
@@ -117,14 +122,39 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+ }
+};
+
++static irqreturn_t nslu2_spkr_handler(int irq, void *dev_id, struct pt_regs *regs)
++{
++ /* clear interrupt */
++ *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
++
++ /* flip the beeper output */
++ *IXP4XX_GPIO_GPOUTR ^= NSLU2_BZ_BM;
++
++ return IRQ_HANDLED;
++}
+
+static int __init nslu2_spkr_init(void)
+{
++ if (request_irq(IRQ_IXP4XX_TIMER2, &nslu2_spkr_handler,
++ SA_INTERRUPT | SA_TIMER, "NSLU2 beeper", NULL < 0)) {
++
++ printk(KERN_INFO "NSLU2 beeper: IRQ %d not available\n",
++ IRQ_IXP4XX_TIMER2);
++
++ return -EIO;
++ }
++
+ input_register_device(&nslu2_spkr_dev);
+
-+ nslu2_spkr_event(NULL, EV_SND, SND_BELL, 1);
++ /* do a little beep to tell the world we are alive */
++ if (beep_on_startup)
++ {
++ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 440);
++ msleep(120);
++ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 0);
++ }
+
-+ printk(KERN_INFO "input: %s\n", nslu2_spkr_dev.name);
++ printk(KERN_INFO "NSLU2: beeper\n");
+ return 0;
+}
+
@@ -132,8 +162,12 @@ diff -urN linux-2.6.14-rc2/drivers/input/misc/nslu2spkr.c test6/drivers/input/mi
+{
+ input_unregister_device(&nslu2_spkr_dev);
+
++ disable_irq(IRQ_IXP4XX_TIMER2);
++
+ /* turn it off */
+ nslu2_spkr_event(NULL, EV_SND, SND_BELL, 0);
++
++ free_irq(IRQ_IXP4XX_TIMER2, NULL);
+}
+
+module_init(nslu2_spkr_init);
diff --git a/packages/linux/nslu2-kernel/2.6.14/defconfig b/packages/linux/nslu2-kernel/2.6.14/defconfig
index 553eb6c48e..7b1dd207a5 100644
--- a/packages/linux/nslu2-kernel/2.6.14/defconfig
+++ b/packages/linux/nslu2-kernel/2.6.14/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.14-rc2
-# Sat Sep 24 16:05:23 2005
+# Linux kernel version: 2.6.14-rc3
+# Wed Oct 5 20:33:54 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -121,7 +121,7 @@ CONFIG_CPU_TLB_V4WBI=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_XSCALE_PMU=y
CONFIG_DMABOUNCE=y
@@ -168,6 +168,7 @@ CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=
# At least one emulation must be selected
#
CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
#
@@ -214,8 +215,103 @@ CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+# CONFIG_NETFILTER_NETLINK is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+CONFIG_IP_NF_CT_PROTO_SCTP=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+# CONFIG_IP_NF_PPTP is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_DCCP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
+CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_TARGET_NFQUEUE is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
#
# DCCP Configuration (EXPERIMENTAL)
@@ -227,7 +323,7 @@ CONFIG_TCP_CONG_BIC=y
#
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
# CONFIG_DECNET is not set
CONFIG_LLC=m
@@ -245,7 +341,7 @@ CONFIG_IPDDP_DECAP=y
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
+CONFIG_NET_CLS_ROUTE=y
#
# Network testing
@@ -269,7 +365,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUSB_SCO=y
# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIBCM203X is not set
+CONFIG_BT_HCIBCM203X=m
# CONFIG_BT_HCIBPA10X is not set
# CONFIG_BT_HCIBFUSB is not set
# CONFIG_BT_HCIVHCI is not set
@@ -284,7 +380,7 @@ CONFIG_BT_HCIUSB_SCO=y
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
#
# Memory Technology Devices (MTD)
@@ -297,7 +393,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
#
@@ -315,10 +411,14 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
@@ -326,6 +426,7 @@ CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
CONFIG_MTD_CFI_INTELEXT=y
# CONFIG_MTD_CFI_AMDSTD is not set
# CONFIG_MTD_CFI_STAA is not set
@@ -432,7 +533,7 @@ CONFIG_BLK_DEV_SD=y
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -486,7 +587,22 @@ CONFIG_SCSI_QLA2XXX=y
#
# Multi-device support (RAID and LVM)
#
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID5=m
+CONFIG_MD_RAID6=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
#
# Fusion MPT device support
@@ -494,6 +610,7 @@ CONFIG_SCSI_QLA2XXX=y
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
#
# IEEE 1394 (FireWire) support
@@ -531,6 +648,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -618,7 +736,14 @@ CONFIG_NET_WIRELESS=y
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
@@ -636,7 +761,25 @@ CONFIG_NET_POLL_CONTROLLER=y
#
# Input device support
#
-# CONFIG_INPUT is not set
+CONFIG_INPUT=m
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
@@ -821,12 +964,56 @@ CONFIG_HWMON=y
#
# Multimedia devices
#
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+
+#
+# Video Adapters
+#
+CONFIG_VIDEO_BT848=m
+# CONFIG_VIDEO_SAA6588 is not set
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_OVCAMCHIP=m
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_VIDEOBUF=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
#
# Graphics support
@@ -836,7 +1023,90 @@ CONFIG_HWMON=y
#
# Sound
#
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_HDA_INTEL is not set
+
+#
+# ALSA ARM devices
+#
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
#
# USB support
@@ -870,11 +1140,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
#
# USB Device Class drivers
#
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
#
# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
@@ -889,15 +1160,34 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
#
# USB Input Devices
#
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
#
# USB HID Boot Protocol drivers
#
+CONFIG_USB_KBD=m
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
#
# USB Imaging devices
@@ -909,10 +1199,16 @@ CONFIG_USB_STORAGE=y
# USB Multimedia devices
#
# CONFIG_USB_DABUSB is not set
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_PWC is not set
#
# USB Network Adapters
diff --git a/packages/linux/nslu2-kernel_2.6.14-rc3.bb b/packages/linux/nslu2-kernel_2.6.14-rc3.bb
index 70962dee71..c59c0db385 100644
--- a/packages/linux/nslu2-kernel_2.6.14-rc3.bb
+++ b/packages/linux/nslu2-kernel_2.6.14-rc3.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "0"
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r1.${PR_CONFIG}"
+PR = "r2.${PR_CONFIG}"
include nslu2-kernel.inc
@@ -31,8 +31,8 @@ N2K_PATCHES = "\
file://25-nslu2-arch-reset.patch;patch=1 \
file://30-i2c-x1205.patch;patch=1 \
file://50-nslu2-arch.patch;patch=1 \
- file://50-nslu2-beeper.patch;patch=1 \
file://50-nslu2-general.patch;patch=1 \
+ file://60-nslu2-beeper.patch;patch=1 \
file://90-ixp4xx-pci-le.patch;patch=1 \
file://anonymiser.patch;patch=1 \
"
diff --git a/packages/linux/openslug-kernel-2.6.14-rc3/defconfig b/packages/linux/openslug-kernel-2.6.14-rc3/defconfig
index 405a2f4400..7b1dd207a5 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc3/defconfig
+++ b/packages/linux/openslug-kernel-2.6.14-rc3/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.14-rc3
-# Tue Oct 4 23:19:43 2005
+# Wed Oct 5 20:33:54 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -121,7 +121,7 @@ CONFIG_CPU_TLB_V4WBI=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_XSCALE_PMU=y
CONFIG_DMABOUNCE=y
@@ -168,6 +168,7 @@ CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=
# At least one emulation must be selected
#
CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
#
@@ -392,7 +393,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
#
@@ -410,10 +411,14 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
@@ -421,6 +426,7 @@ CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
CONFIG_MTD_CFI_INTELEXT=y
# CONFIG_MTD_CFI_AMDSTD is not set
# CONFIG_MTD_CFI_STAA is not set
diff --git a/packages/linux/openslug-kernel_2.6.14-rc3.bb b/packages/linux/openslug-kernel_2.6.14-rc3.bb
index b30d767916..36010dd40e 100644
--- a/packages/linux/openslug-kernel_2.6.14-rc3.bb
+++ b/packages/linux/openslug-kernel_2.6.14-rc3.bb
@@ -5,4 +5,4 @@
include nslu2-kernel_${PV}.bb
# Increment the following if the openslug-kernel defconfig is
# changed.
-PR_CONFIG = "0"
+PR_CONFIG = "1"
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 5559929141..600d9fb3ad 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -10,9 +10,10 @@ inherit autotools pkgconfig gettext
CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
+EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
EXTRA_OECONF_append_h3600 = " --enable-small-icons "
EXTRA_OECONF_append_h3900 = " --enable-small-icons "
+EXTRA_OECONF_append_h2200 = " --enable-small-icons "
EXTRA_OECONF_append_collie = " --enable-small-icons "
EXTRA_OECONF_append_poodle = " --enable-small-icons "
EXTRA_OECONF_append_mnci = " --enable-small-icons "
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 9824134862..1e75c49413 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -4,7 +4,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D
gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
-PR = "r17"
+PR = "r19"
export IMAGE_BASENAME = "gpe-image"
@@ -13,19 +13,30 @@ GUI_MACHINE_CLASS ?= "none"
GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
+GPE_EXTRA_THEMES = "gpe-theme-industrial"
-#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "figment"
-GPE_EXTRA_INSTALL_bigscreen = " figment gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-GPE_EXTRA_DEPENDS_smallscreen = "gpe-mini-browser figment linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "gpe-mini-browser figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-#h3900 has 32mb of *useable* flash
-#GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe "
-#GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe "
+#ship more stuff with devices with >16MB of flash
+GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
+ gpe-theme-clearlooks \
+ gpe-filemanager \
+ gpe-nmf \
+ figment \
+",d)}'
+
+
+GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
+ gpe-task-connectivity \
+ ${GPE_BIGFLASH_DEPENDS} \
+",d)}'
+
+GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS}
+GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
GPE_EXTRA_DEPENDS_none = ""
GPE_EXTRA_INSTALL_none = ""
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index c23031d20f..8e09472c5b 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
+PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r38"
+PR = "r41"
ALLOW_EMPTY = "1"
@@ -13,6 +13,7 @@ RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
DEPENDS += " ${gpe-base-depends}"
gpe-task-base = "\
+ gpe-bootsplash \
bluez-utils-dbus \
matchbox \
xcursor-transparent-theme \
@@ -103,6 +104,15 @@ gpe-task-games = "\
RDEPENDS_gpe-task-games := "${gpe-task-games}"
DEPENDS += " ${gpe-task-games}"
+gpe-task-connectivity = "\
+ gpe-mini-browser \
+ gaim \
+ linphone-hh"
+
+RDEPENDS_gpe-task-connectivity := "${gpe-task-connectivity}"
+DEPENDS += " ${gpe-task-connectivity}"
+
+
DEPENDS += "matchbox-themes-extra"
LICENSE = "MIT"
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 7be2072040..4fa516f582 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -131,6 +131,7 @@ OPENSLUG_PACKAGES = "\
wget \
xinetd \
yp-tools ypbind ypserv \
+ zd1211 \
zlib \
"
diff --git a/packages/meta/ucslugc-native.bb b/packages/meta/ucslugc-native.bb
index c878f31562..019ea7a5c3 100644
--- a/packages/meta/ucslugc-native.bb
+++ b/packages/meta/ucslugc-native.bb
@@ -9,8 +9,8 @@ PACKAGES = "${PN}"
# Run-time only (RDEPENDS) stuff - no package explicitly provides
# these targets.
UCSLUGC_NATIVE_RT_prepend_linux = "\
- glibc-utils \
- libc6-dev \
+ glibc-extra-nss glibc-utils \
+ libc6 libc6-dev \
"
UCSLUGC_NATIVE_RT_prepend_linux-uclibc = "\
uclibc-dev uclibc-utils \
@@ -33,8 +33,6 @@ UCSLUGC_NATIVE_RT = "\
# Run-time and DEPENDS
UCSLUGC_NATIVE_prepend_linux = "\
- glibc-extra-nss \
- libc6 \
"
UCSLUGC_NATIVE_prepend_linux-uclibc = "\
libiconv \
diff --git a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
index 7a460decda..4d3392c128 100644
--- a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
+++ b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
@@ -4,7 +4,7 @@
DEPENDS="perl-native"
LICENSE="BSD"
-SRC_URI="http://ftp.rutgers.edu/pub/FreeBSD/ports/packages/archivers/rpm2cpio-1.2_2.tgz"
+SRC_URI="${FREEBSD_MIRROR}/ports/packages/archivers/rpm2cpio-1.2_2.tbz"
inherit native
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 0c9ace6691..65f1420096 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -37,13 +37,13 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;
file://kmode.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 "
-SRC_URI_append_mnci = "file://onlyfb.patch;patch=1 \
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
file://devfs.patch;patch=1 \
file://disable-apm.patch;patch=1"
-SRC_URI_append_poodle = "file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_c7x0 = "file://disable-apm.patch;patch=1"
-SRC_URI_append_ipaq-pxa270= "file://disable-apm.patch;patch=1"
-SRC_URI_append_h3900 = "file://disable-apm.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
+SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1"
+SRC_URI_append_h3900 = " file://disable-apm.patch;patch=1"
SRC_URI_append_h2200 = " file://disable-apm.patch;patch=1"
PACKAGE_ARCH_poodle = "poodle"
diff --git a/packages/zd1211/zd1211-20050315/.mtn2git_empty b/packages/zd1211/zd1211-20050315/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/zd1211/zd1211-20050315/.mtn2git_empty
+++ /dev/null
diff --git a/packages/zd1211/zd1211-20050315/Makefile.patch b/packages/zd1211/zd1211-20050315/Makefile.patch
deleted file mode 100644
index 76e422d476..0000000000
--- a/packages/zd1211/zd1211-20050315/Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- zd1211/Makefile.orig 2005-08-14 04:50:45.898802688 +0200
-+++ zd1211/Makefile 2005-08-14 04:50:53.134702664 +0200
-@@ -4,9 +4,9 @@
- #
-
- # Some commands
--CC=gcc
--CPP=g++
--LD=ld
-+#CC=gcc
-+#CPP=g++
-+#LD=ld
- RM=rm -f -r
- CVS=cvs
- TAR=tar
diff --git a/packages/zd1211/zd1211-20050822/access_ok.patch b/packages/zd1211/zd1211-20050822/access_ok.patch
new file mode 100644
index 0000000000..95fbb592b0
--- /dev/null
+++ b/packages/zd1211/zd1211-20050822/access_ok.patch
@@ -0,0 +1,11 @@
+--- zd1211/src/zd1205.c.orig 2005-10-06 03:30:27.200837520 +0200
++++ zd1211/src/zd1205.c 2005-10-06 03:29:37.176442384 +0200
+@@ -4434,7 +4434,7 @@
+ { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" },
+ };
+
+- err = verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
++ err = access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
+ if (err)
+ break;
+
diff --git a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch b/packages/zd1211/zd1211-20050822/iwconfig-rate.patch
new file mode 100644
index 0000000000..c1cb634b1a
--- /dev/null
+++ b/packages/zd1211/zd1211-20050822/iwconfig-rate.patch
@@ -0,0 +1,126 @@
+--- zd1211/src/zd1205.c 7 Jun 2005 21:45:21 -0000 1.17
++++ zd1211/src/zd1205.c 24 Aug 2005 11:39:29 -0000
+@@ -3599,9 +3599,59 @@
+
+ }
+
++static const unsigned long zd1205_rates[] = {
++ /* RATE_1M, 0 */
++ 1000000,
++ /* RATE_2M, 1 */
++ 2000000,
++ /* RATE_5M, 2 */
++ 5500000,
++ /* RATE_11M, 3 */
++ 11000000,
++ /* RATE_6M, 4 */
++ 600000,
++ /* RATE_9M, 5 */
++ 9000000,
++ /* RATE_12M, 6 */
++ 12000000,
++ /* RATE_18M, 7 */
++ 18000000,
++ /* RATE_24M, 8 */
++ 24000000,
++ /* RATE_36M, 9 */
++ 36000000,
++ /* RATE_48M, 10 */
++ 48000000,
++ /* RATE_54M, 11 */
++ 54000000,
++};
++
++#define ZD1205_NRATES ((sizeof(zd1205_rates))/(sizeof(unsigned long)))
++
+ static int zd1205_ioctl_setrate(struct net_device *dev, struct iw_param *frq)
+ {
+- return 0;
++ struct zd1205_private *macp = dev->priv;
++ U8 rate;
++ if(frq->value < 0) {
++ /* Auto */
++ macp->bFixedRate = 0;
++ macp->AdapterMaxRate = RATE_54M;
++ return 0;
++ }
++ for(rate = 0; rate < ZD1205_NRATES; rate++)
++ if(zd1205_rates[rate] == frq->value) {
++ zd1205_lock(macp);
++ macp->bFixedRate = frq->fixed;
++ if(frq->fixed)
++ macp->cardSetting.FixedRate = rate;
++ else {
++ macp->AdapterMaxRate = rate;
++ macp->cardSetting.TxRate = rate;
++ }
++ zd1205_unlock(macp);
++ return 0;
++ }
++ return -EINVAL;
+ }
+
+ static int zd1205_ioctl_getrate(struct net_device *dev, struct iw_param *frq)
+@@ -3612,60 +3662,9 @@
+ frq->disabled = 0;
+ frq->value = 0;
+
+- switch(macp->cardSetting.CurrTxRate)
+- {
+- case RATE_1M:
+- frq->value = 1000000;
+- break;
+-
+- case RATE_2M:
+- frq->value = 2000000;
+- break;
+-
+- case RATE_5M:
+- frq->value = 5500000;
+- break;
+-
+- case RATE_11M:
+- frq->value = 11000000;
+- break;
+-
+- case RATE_6M:
+- frq->value = 600000;
+- break;
+-
+- case RATE_9M:
+- frq->value = 9000000;
+- break;
+-
+- case RATE_12M:
+- frq->value = 12000000;
+- break;
+-
+- case RATE_18M:
+- frq->value = 18000000;
+- break;
+-
+- case RATE_24M:
+- frq->value = 24000000;
+- break;
+-
+- case RATE_36M:
+- frq->value = 36000000;
+- break;
+-
+- case RATE_48M:
+- frq->value = 48000000;
+- break;
+-
+- case RATE_54M:
+- frq->value = 54000000;
+- break;
+-
+- default:
++ if(macp->cardSetting.CurrTxRate > ZD1205_NRATES)
+ return -EINVAL;
+- }
+-
++ frq->value = zd1205_rates[macp->cardSetting.CurrTxRate];
+ return 0;
+ }
+
diff --git a/packages/zd1211/zd1211-20050822/urb-async.patch b/packages/zd1211/zd1211-20050822/urb-async.patch
new file mode 100644
index 0000000000..cd1149e766
--- /dev/null
+++ b/packages/zd1211/zd1211-20050822/urb-async.patch
@@ -0,0 +1,82 @@
+--- zd1211/src/zd1211.c.orig 2005-03-27 22:47:35.000000000 +0200
++++ zd1211/src/zd1211.c 2005-10-06 02:53:23.380909536 +0200
+@@ -313,7 +313,6 @@
+ } else {
+ usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pBuffer, DataLen,zd1211_reg_cb, macp);
+ }
+- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
+
+ if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
+ printk(KERN_ERR "zd1211: failed reg_urb\n");
+@@ -362,7 +361,6 @@
+ } else {
+ usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
+ }
+- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ if ((ret = SUBMIT_URB(macp->reg_urb, memflags))) {
+ printk(KERN_ERR "zd1211: failed reg_urb\n");
+ zd1211_DumpErrorCode(macp, ret);
+@@ -426,7 +424,6 @@
+ } else {
+ usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
+ }
+- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
+
+ if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
+ printk(KERN_ERR "zd1211: failed reg_urb\n");
+@@ -569,7 +566,6 @@
+ usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
+ }
+
+- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
+ printk(KERN_ERR "zd1211: failed reg_urb\n");
+ zd1211_DumpErrorCode(macp, ret);
+@@ -1240,7 +1236,6 @@
+ pRegBuffer, bufSize,
+ zd1211_reg_cb, macp);
+
+- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
+
+ if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
+ printk(KERN_ERR "zd1211: failed rf reg_urb\n");
+@@ -1311,7 +1306,6 @@
+ return;
+
+ printk("%s: Tx timed out.\n", dev->name);
+- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ USB_URB(macp->tx_urb);
+ }
+
+@@ -1384,7 +1378,6 @@
+ zd1211_intr_cb, macp);
+ #endif
+
+- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK;
+
+ if ((res = SUBMIT_URB(macp->intr_urb, GFP_KERNEL))) {
+ printk(KERN_ERR "zd1211: failed intr_urb\n");
+@@ -1822,7 +1815,6 @@
+ macp->IntEPBuffer, MAX_EPINT_BUFFER,
+ zd1211_intr_cb, macp);
+
+- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ status = SUBMIT_URB(macp->intr_urb, GFP_ATOMIC);
+
+ if (status)
+@@ -1916,7 +1908,6 @@
+ usb_rcvbulkpipe(macp->usb, EP_DATA_IN),
+ rx_buff, bufLen, zd1211_rx_comp_cb, macp);
+
+- macp->rx_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ if ((res = SUBMIT_URB(macp->rx_urb, GFP_ATOMIC))) {
+ printk(KERN_ERR "zd1211: failed rx_urb\n");
+ zd1211_DumpErrorCode(macp, res);
+@@ -2024,7 +2015,6 @@
+ macp->tx_buff, TotalLength,zd1211_tx_comp_cb, macp);
+
+ macp->tx_urb->transfer_buffer_length = TotalLength;
+- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
+ res = SUBMIT_URB(macp->tx_urb, GFP_ATOMIC);
+ if (res) {
+ printk("error in tx submit urb: %d", res);
diff --git a/packages/zd1211/zd1211_20050315.bb b/packages/zd1211/zd1211_20050315.bb
deleted file mode 100644
index 068839fd34..0000000000
--- a/packages/zd1211/zd1211_20050315.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz \
- file://Makefile.patch;patch=1"
-# file://Makefile"
-
-S = "${WORKDIR}/zd1211"
-
-inherit module
-
-#do_compile_prepend() {
-# cp -f ${WORKDIR}/Makefile ${S}/
-#}
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
- oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \
- 'KDIR=${STAGING_KERNEL_DIR}' \
- 'CC="${KERNEL_CC}"' \
- 'LD="${KERNEL_LD}"'
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
-}
-
diff --git a/packages/zd1211/zd1211_20050822.bb b/packages/zd1211/zd1211_20050822.bb
index cc1cc9f8f7..917706ee34 100644
--- a/packages/zd1211/zd1211_20050822.bb
+++ b/packages/zd1211/zd1211_20050822.bb
@@ -3,11 +3,14 @@ PRIORITY = "optional"
SECTION = "kernel/modules"
MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
RDEPENDS = "wireless-tools"
SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz \
- file://makefile.patch;patch=1"
+ file://makefile.patch;patch=1 \
+ file://iwconfig-rate.patch;patch=1 \
+ file://access_ok.patch;patch=1 \
+ file://urb-async.patch;patch=1"
S = "${WORKDIR}/zd1211"