Menu
▾
▴
hackndev-commit — Subversion commits (with diffs)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(22) |
Oct
(55) |
Nov
(24) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(68) |
Feb
(85) |
Mar
(54) |
Apr
(12) |
May
(52) |
Jun
(75) |
Jul
(116) |
Aug
(71) |
Sep
(54) |
Oct
|
Nov
(2) |
Dec
|
|
From: <mar...@us...> - 2007-06-14 15:48:07
|
Revision: 1035
http://svn.sourceforge.net/hackndev/?rev=1035&view=rev
Author: marex_z71
Date: 2007-06-14 08:47:55 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
PalmTE2, PalmTC: fix horrible coding style
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-13 15:59:41 UTC (rev 1034)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-14 15:47:55 UTC (rev 1035)
@@ -98,9 +98,9 @@
}
static struct pxamci_platform_data palmtc_mci_platform_data = {
- .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
+ .ocr_mask = (MMC_VDD_32_33 | MMC_VDD_33_34),
.init = palmtc_mci_init,
- /* .setpower = palmld_mci_setpower, */
+/* .setpower = palmld_mci_setpower, */
.exit = palmtc_mci_exit,
};
@@ -108,11 +108,11 @@
/* Backlight ***/
static struct pxapwmbl_platform_data palmtc_backlight_data = {
.pwm = 1,
- .max_intensity = 0x100, //120
- .default_intensity = 0x50, //11a
+ .max_intensity = 0x100,
+ .default_intensity = 0x50,
.limit_mask = 0x7F,
- .prescaler = 1, // 7
- .period = 0x12B, // 16c
+ .prescaler = 1,
+ .period = 0x12B,
};
@@ -126,9 +126,9 @@
};
static struct platform_device palmtc_backlight = {
- .name = "pxapwm-bl",
- .dev = {
- .platform_data = &palmtc_backlight_data,
+ .name = "pxapwm-bl",
+ .dev = {
+ .platform_data = &palmtc_backlight_data,
},
};
@@ -136,7 +136,9 @@
static struct platform_device palmtc_ac97_device = {
.name = "pxa2xx-ac97",
.id = -1,
- .dev = { .platform_data = &palmtc_audio_ops },
+ .dev = {
+ .platform_data = &palmtc_audio_ops
+ },
};
static struct platform_device palmtc_keyboard_device = {
@@ -163,8 +165,8 @@
}
MACHINE_START(OMAP_PALMTC, "Palm Tungsten C")
- /* Maintainer: P3T3, Petr Blaha <p3...@ce...> */
-// .phys_ram = 0xa0000000,
+/* Maintainer: P3T3, Petr Blaha <p3...@ce...> */
+/* .phys_ram = 0xa0000000, */
.phys_io = 0x40000000,
.boot_params = 0xa0000100,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
@@ -173,4 +175,3 @@
.timer = &pxa_timer,
.init_machine = palmtc_init
MACHINE_END
-
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-13 15:59:41 UTC (rev 1034)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-14 15:47:55 UTC (rev 1035)
@@ -48,7 +48,7 @@
static void
palmte2_irda_configure (struct uart_pxa_port *up, int enable)
{
- //printk("irda_configure, %d\n", enable);
+ /* printk("irda_configure, %d\n", enable); */
/* Switch STUART RX/TX pins to SIR */
pxa_gpio_mode(GPIO_NR_PALMLD_STD_RXD_MD);
@@ -92,8 +92,7 @@
new_stisr &= ~STISR_RCVEIR;
if (new_stisr != old_stisr) {
- while (!(STLSR & LSR_TEMT))
- ;
+ while (!(STLSR & LSR_TEMT));
STISR = new_stisr;
}
}
@@ -101,22 +100,22 @@
static int
palmte2_irda_get_txrx (struct uart_pxa_port *up)
{
- return ((STISR & STISR_XMITIR) ? PXA_SERIAL_TX : 0) |
- ((STISR & STISR_RCVEIR) ? PXA_SERIAL_RX : 0);
+ return (((STISR & STISR_XMITIR) ? PXA_SERIAL_TX : 0) |
+ ((STISR & STISR_RCVEIR) ? PXA_SERIAL_RX : 0));
}
static struct platform_pxa_serial_funcs palmte2_pxa_irda_funcs = {
- .configure = palmte2_irda_configure,
- .set_txrx = palmte2_irda_set_txrx,
- .get_txrx = palmte2_irda_get_txrx,
+ .configure = palmte2_irda_configure,
+ .set_txrx = palmte2_irda_set_txrx,
+ .get_txrx = palmte2_irda_get_txrx,
};
#endif
struct platform_device palmte2_buttons = {
- .name = "palmte2-buttons",
- .id = -1,
+ .name = "palmte2-buttons",
+ .id = -1,
};
/**
@@ -135,7 +134,9 @@
static struct platform_device palmld_ac97 = {
.name = "pxa2xx-ac97",
.id = -1,
- .dev = { .platform_data = &palmld_audio_ops },
+ .dev = {
+ .platform_data = &palmld_audio_ops
+ },
};
@@ -153,10 +154,10 @@
};
static struct platform_device palmte2_backlight = {
- .name = "pxapwm-bl",
- .dev = {
- .platform_data = &palmte2_backlight_data,
- },
+ .name = "pxapwm-bl",
+ .dev = {
+ .platform_data = &palmte2_backlight_data,
+ },
};
@@ -178,14 +179,14 @@
PWM_PERVAL0 = 0x16c;
/* turn on PWMs */
CKEN |= CKEN0_PWM0 | CKEN1_PWM1;
- } else {
- /* turn off PWMs */
- CKEN &= ~(CKEN0_PWM0 | CKEN1_PWM1);
- }
+ } else {
+ /* turn off PWMs */
+ CKEN &= ~(CKEN0_PWM0 | CKEN1_PWM1);
+ }
}
static struct pxafb_mode_info palmte2_lcd_modes[] = {
-{
+ {
.pixclock = 0,
.xres = 320,
.yres = 320,
@@ -198,9 +199,7 @@
.upper_margin = 7,
.lower_margin = 5,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
-
-// .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
-},
+ },
};
static struct pxafb_mach_info palmte2_lcd_screen = {
@@ -218,7 +217,7 @@
set_pxa_fb_info(&palmte2_lcd_screen);
-// stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs;
+/* stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs; */
platform_add_devices(devices, ARRAY_SIZE(devices));
/*
@@ -228,8 +227,8 @@
}
MACHINE_START(TUNGE2, "Palm Tungsten E2")
- Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...>
- //.phys_ram = 0xa0000000,
+/* Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...> */
+/* .phys_ram = 0xa0000000, */
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = pxa_map_io,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-06-13 15:59:46
|
Revision: 1034
http://svn.sourceforge.net/hackndev/?rev=1034&view=rev
Author: miska_tx
Date: 2007-06-13 08:59:41 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
Some patches to aufs to make it possible to compile it.
Modified Paths:
--------------
linux4palm/linux/trunk/fs/aufs/Kconfig
linux4palm/linux/trunk/fs/aufs/sysaufs.c
linux4palm/linux/trunk/fs/aufs/wkq.c
linux4palm/linux/trunk/include/linux/aufs_type.h
Modified: linux4palm/linux/trunk/fs/aufs/Kconfig
===================================================================
--- linux4palm/linux/trunk/fs/aufs/Kconfig 2007-06-13 15:16:08 UTC (rev 1033)
+++ linux4palm/linux/trunk/fs/aufs/Kconfig 2007-06-13 15:59:41 UTC (rev 1034)
@@ -10,7 +10,26 @@
different from Unionfs while keeping the basic features.
See Unionfs for the basic features.
if AUFS
-comment "These options are generated automatically for 2.6.21-hnd1"
+config AUFS_NWKQ_DEF
+ int "Number of aufs kernel threads"
+ depends on AUFS
+ default "4"
+ help
+ Those threads stay in the system and handle the special I/O requests
+ from aufs. The default value is 4. If you enable CONFIG_SYSFS, you can
+ check this value through <sysfs>/module/aufs/parameters/nwkq. So how
+ many threads is enough? You can check it by <sysfs>/fs/aufs/stat,
+ if you enable CONFIG_AUFS_SUSAUFS too. It shows the maximum number of the
+ enqueued work at a time per a thread. Usually they are all small numbers or
+ 0. If your work- load is heavy and you feel the response is low, then check
+ these values. If there are no zero and any of them is larger than 2 or 3,
+ you should set 'nwkq' module parameter greater then the default value.
+ But the reason of the bad response is in your branch filesystem, to
+ increase the number of aufs thread will not help you. The last number in
+ <sysfs>/fs/aufs/stat after comma is the maxi- mum number of the 'no-wait'
+ enqueued work at a time. Aufs enqueues such work to the system global
+ workqueue called 'events', but doesn't wait for its completion. Usually they
+ does no harm the time-performance of aufs.
config AUFS_FAKE_DM
bool "Use simplified (fake) nameidata"
depends on AUFS
Modified: linux4palm/linux/trunk/fs/aufs/sysaufs.c
===================================================================
--- linux4palm/linux/trunk/fs/aufs/sysaufs.c 2007-06-13 15:16:08 UTC (rev 1033)
+++ linux4palm/linux/trunk/fs/aufs/sysaufs.c 2007-06-13 15:59:41 UTC (rev 1034)
@@ -596,7 +596,7 @@
return err;
}
-void __exit sysaufs_fin(void)
+void sysaufs_fin(void)
{
mutex_lock(&aufs_sbilist_mtx);
unreg(&aufs_subsys, g_array, ARRAY_SIZE(g_array), &fs_subsys);
Modified: linux4palm/linux/trunk/fs/aufs/wkq.c
===================================================================
--- linux4palm/linux/trunk/fs/aufs/wkq.c 2007-06-13 15:16:08 UTC (rev 1033)
+++ linux4palm/linux/trunk/fs/aufs/wkq.c 2007-06-13 15:59:41 UTC (rev 1034)
@@ -91,8 +91,12 @@
old = wkq->max_busy;
if (new <= old)
break;
+#ifdef __LINUX_ARM_ARCH__
+ } while (atomic_cmpxchg((atomic_t *)(&wkq->max_busy), old, new) == old);
+#else
} while (cmpxchg(&wkq->max_busy, old, new) == old);
#endif
+#endif
}
static int enqueue(struct au_wkq *wkq, struct au_wkinfo *wkinfo)
Modified: linux4palm/linux/trunk/include/linux/aufs_type.h
===================================================================
--- linux4palm/linux/trunk/include/linux/aufs_type.h 2007-06-13 15:16:08 UTC (rev 1033)
+++ linux4palm/linux/trunk/include/linux/aufs_type.h 2007-06-13 15:59:41 UTC (rev 1034)
@@ -27,12 +27,10 @@
/* ---------------------------------------------------------------------- */
+typedef short aufs_bindex_t;
#ifdef CONFIG_AUFS_BRANCH_MAX_127
-typedef char aufs_bindex_t;
#define AUFS_BRANCH_MAX 127
-#else
-typedef short aufs_bindex_t;
-#ifdef CONFIG_AUFS_BRANCH_MAX_511
+#elif CONFIG_AUFS_BRANCH_MAX_511
#define AUFS_BRANCH_MAX 511
#elif defined(CONFIG_AUFS_BRANCH_MAX_1023)
#define AUFS_BRANCH_MAX 1023
@@ -41,7 +39,6 @@
#else
#error unknown CONFIG_AUFS_BRANCH_MAX value
#endif
-#endif
#define AUFS_NAME "aufs"
#define AUFS_FSTYPE AUFS_NAME
@@ -56,7 +53,11 @@
#define AUFS_DIRWH_DEF 3
#define AUFS_RDCACHE_DEF 10 /* seconds */
#define AUFS_WKQ_NAME AUFS_NAME "d"
+#ifdef CONFIG_AUFS_NWKQ_DEF
+#define AUFS_NWKQ_DEF CONFIG_AUFS_NWKQ_DEF
+#else
#define AUFS_NWKQ_DEF 4
+#endif
#ifdef CONFIG_AUFS_COMPAT
#define AUFS_DIROPQ_NAME "__dir_opaque"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-06-12 21:34:35
|
Revision: 1032
http://svn.sourceforge.net/hackndev/?rev=1032&view=rev
Author: miska_tx
Date: 2007-06-12 14:34:32 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
Fixed Kconfig for camera.
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/media/video/Kconfig
Modified: linux4palm/linux/trunk/drivers/media/video/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/Kconfig 2007-06-12 13:31:50 UTC (rev 1031)
+++ linux4palm/linux/trunk/drivers/media/video/Kconfig 2007-06-12 21:34:32 UTC (rev 1032)
@@ -767,6 +767,4 @@
depends on VIDEO_DEV
tristate "Camera Interface for PXA27x"
-endchoice
-
endmenu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-06-12 13:31:54
|
Revision: 1031
http://svn.sourceforge.net/hackndev/?rev=1031&view=rev
Author: happy-slapin
Date: 2007-06-12 06:31:50 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
PXA27x: Added missing header
Added Paths:
-----------
linux4palm/linux/trunk/include/linux/pxa_camera.h
Added: linux4palm/linux/trunk/include/linux/pxa_camera.h
===================================================================
--- linux4palm/linux/trunk/include/linux/pxa_camera.h (rev 0)
+++ linux4palm/linux/trunk/include/linux/pxa_camera.h 2007-06-12 13:31:50 UTC (rev 1031)
@@ -0,0 +1,464 @@
+/*
+ * pxa_camera.h
+ *
+ * Bulverde Processor Camera Interface driver.
+ *
+ * Copyright (C) 2003, Intel Corporation
+ * Copyright (C) 2003, Montavista Software Inc.
+ * Copyright (C) 2003-2006 Motorola Inc.
+ *
+ * Author: Intel Corporation Inc.
+ * MontaVista Software, Inc.
+ * so...@mv...
+ * Motorola Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+
+Revision History:
+ Modification Tracking
+Author Date Number Description of Changes
+---------------- ------------ ---------- -------------------------
+Wang Fei/w20239 12/19/2003 LIBdd35749 Created
+Wang Fei/w20239 02/05/2004 LIBdd74309 Set frame rate in video mode
+Wang Fei/w20239 03/08/2004 LIBdd84578 Photo effects setting
+Wang Fei/w20239 11/01/2004 LIBxxxxxxx Change to SDK style
+*/
+
+/*================================================================================
+ INCLUDE FILES
+================================================================================*/
+#ifndef __PXA_CAMERA_H__
+#define __PXA_CAMERA_H__
+
+/*!
+ * General description of the Motorola A780/E680 video device driver:
+ *
+ * The Motorola A780/E680 video device is based on V4L (video for linux) 1.0, however not
+ * all V4L features are supported.
+ * There are also some additional extensions included for specific requirements beyond V4L.
+ *
+ * The video device driver has a "character special" file named /dev/video0. Developers can
+ * access the video device via the file operator interfaces.
+ * Six file operator interfaces are supported:
+ * open
+ * ioctl
+ * mmap
+ * poll/select
+ * read
+ * close
+ * For information on using these fuctions, please refer to the standard linux
+ * development documents.
+ *
+ * These four ioctl interfaces are important for getting the video device to work properly:
+ * VIDIOCGCAP Gets the video device capability
+ * VIDIOCCAPTURE Starts/stops the video capture
+ * VIDIOCGMBUF Gets the image frame buffer map info
+ * VIDIOCSWIN Sets the picture size
+ * These interfaces are compatible with V4L 1.0. Please refer to V4L documents for more details.
+ * sample.c demonstrates their use.
+ *
+ * The following ioctl interfaces are Motorola-specific extensions. These are not compatible with V4L 1.0.
+ * WCAM_VIDIOCSCAMREG
+ * WCAM_VIDIOCGCAMREG
+ * WCAM_VIDIOCSCIREG
+ * WCAM_VIDIOCGCIREG
+ * WCAM_VIDIOCSINFOR
+ * WCAM_VIDIOCGINFOR
+ * WCAM_VIDIOCSSSIZE
+ * WCAM_VIDIOCSOSIZE
+ * WCAM_VIDIOCGSSIZE
+ * WCAM_VIDIOCGOSIZE
+ * WCAM_VIDIOCSFPS
+ * WCAM_VIDIOCSNIGHTMODE
+ * WCAM_VIDIOCSSTYLE
+ * WCAM_VIDIOCSLIGHT
+ * WCAM_VIDIOCSBRIGHT
+ * WCAM_VIDIOCSBUFCOUNT
+ * WCAM_VIDIOCGCURFRMS
+ * WCAM_VIDIOCGSTYPE
+ * WCAM_VIDIOCSCONTRAST
+ * WCAM_VIDIOCSFLICKER
+ * Detailed information about these constants are described below.
+ *
+ * sample.c demonstrates most features of the Motorola A780/E680 video device driver.
+ * - Opening/closing the video device
+ * - Initializing the video device driver
+ * - Displaying the video image on a A780/E680 LCD screen
+ * - Changing the image size
+ * - Changing the style
+ * - Changing the light mode
+ * - Changing the brightness
+ * - Capturing and saving a still picture
+ */
+
+/*!
+ * These are the registers for the read/write camera module and the CIF
+ * (Intel PXA27x processer quick capture interface)
+ * The following 4 ioctl interfaces are used for debugging and are not open to developers
+ */
+#define WCAM_VIDIOCSCAMREG 211
+#define WCAM_VIDIOCGCAMREG 212
+#define WCAM_VIDIOCSCIREG 213
+#define WCAM_VIDIOCGCIREG 214
+
+/*!
+ * WCAM_VIDIOCSINFOR Sets the image data format
+ *
+ * The following code sets the image format to YCbCr422_planar
+ *
+ * struct {int val1, val2;}format;
+ * format.val1 = CAMERA_IMAGE_FORMAT_YCBCR422_PLANAR;
+ * format.val2 = CAMERA_IMAGE_FORMAT_YCBCR422_PLANAR;
+ * //dev is the video device handle
+ * ioctl(dev, WCAM_VIDIOCSINFOR, &format);
+ *
+ * Remarks:
+ * val1 is the output format of the camera module, val2 is the output format of the CIF (capture
+ * interface). Image data from the camera module can be converted to other formats through
+ * the CIF. val2 specifies the final output format of the video device.
+ *
+ * For more description on CIF please refer to the Intel PXA27x processor family developer's manual.
+ * http://www.intel.com/design/pca/prodbref/253820.html
+ */
+#define WCAM_VIDIOCSINFOR 215
+
+/*
+ * WCAM_VIDIOCGINFOR Gets the image data format
+ *
+ * struct {int val1, val2;}format;
+ * ioctl(dev, WCAM_VIDIOCGINFOR, &format);
+ */
+#define WCAM_VIDIOCGINFOR 216
+
+/*!
+ * WCAM_VIDIOCSSSIZE Sets the sensor window size
+ *
+ * The following code sets the sensor size to 640 X 480:
+ *
+ * struct {unsigned short w, h;}sensor_size;
+ * sensor_size.w = 640;
+ * sensor_size.h = 480;
+ * //dev is the video device handle
+ * ioctl(dev, WCAM_VIDIOCSSSIZE, &sensor_size);
+ *
+ * Remarks:
+ * The sensor size is restricted by the video device capability.
+ * VIDIOCGCAP can get the video device capability.
+ * The sensor size must be an even of multiple of 8. If not, the driver changes the sensor size to a multiple of 8.
+ */
+#define WCAM_VIDIOCSSSIZE 217
+
+/*!
+ * WCAM_VIDIOCSOSIZE Sets output size of the video device
+ *
+ * The following code segment shows how to set the output size to 240 X 320:
+ *
+ * struct {unsigned short w, h;}out_size;
+ * out_size.w = 240;
+ * out_size.h = 320;
+ * //dev is the video device handle
+ * ioctl(dev, WCAM_VIDIOCSSSIZE, &out_size);
+ *
+ * Remarks:
+ * In video mode, the output size must be less than 240X320. However, in still mode, the output
+ * size is restricted by the video device capability and the sensor size.
+ * The output size must always be less than the sensor size, so if the developer changes the output size
+ * to be greater than the sensor size, the video device driver may work abnormally.
+ * The width and height must also be a multiple of 8. If it is not, the driver changes the width and height size to a multiple of 8.
+ * The developer can modify the sensor size and the output size to create a digital zoom.
+ */
+#define WCAM_VIDIOCSOSIZE 218
+
+/*!
+ * WCAM_VIDIOCGSSIZE Gets the current sensor size.
+ *
+ * The following code segment shows how to use this function:
+ *
+ * struct {unsigned short w, h;}sensor_size;
+ * //dev is the video device handle
+ * ioctl(dev, WCAM_VIDIOCGSSIZE, &sensor_size);
+ * printf("sensor width is %d, sensor_height is %d\n", sensor_size.w, sensor_size.h);
+ *
+ */
+#define WCAM_VIDIOCGSSIZE 219
+
+/*!
+ * WCAM_VIDIOCGOSIZE Gets the current output size.
+ *
+ * The following code segment shows how to use this function:
+ *
+ * struct {unsigned short w, h;}out_size;
+ * //dev is the video device handle
+ * ioctl(dev, WCAM_VIDIOCGOSIZE, &out_size);
+ * printf("output width is %d, output height is %d\n", out_size.w, out_size.h);
+ *
+ */
+#define WCAM_VIDIOCGOSIZE 220
+
+/*!
+ * WCAM_VIDIOCSFPS Sets the output frame rate (fps- frames per second) of the video device
+ *
+ * The following code segment shows how to use this function:
+ *
+ * struct {int maxfps, minfps;}fps;
+ * fps.maxfps = 15;
+ * fps.minfps = 12;
+ * ioctl(dev, WCAM_VIDIOCSFPS, &fps);
+ *
+ * Remarks:
+ * The minimum value of maxfps is 1; the maximum value is 15. minfps must not exceed maxfps.
+ * The default value of fps is [15, 10].
+ * minfps and maxfps only suggest a fps range. The video device driver will select
+ * an appropriate value automatically. The actual fps depends on environmental circumstances
+ * such as brightness, illumination, etc.
+ * sample.c illustrates how to calculate actual frame rate.
+ *
+ */
+#define WCAM_VIDIOCSFPS 221
+
+/*!
+ * WCAM_VIDIOCSNIGHTMODE Sets the video device capture mode.
+ *
+ * The capture mode can use the following values
+ *
+ * V4l_NM_AUTO Auto mode(default value)
+ * V4l_NM_NIGHT Night mode
+ * V4l_NM_ACTION Action mode
+ *
+ * The following code segment shows how to set the video device to night mode:
+ *
+ * ioctl(dev, WCAM_VIDIOCSNIGHTMODE, V4l_NM_NIGHT);
+ *
+ * Remarks:
+ * Different capture modes represent different sensor exposure times. Night mode represents a longer
+ * exposure time. Setting the video device to night mode can capture high quality image data in low light environments.
+ * Action mode represents a shorter exposure time. This is used for capture moving objects. When working in auto mode, the
+ * video device will select an appropriate exposure time automatically.
+ *
+ * Not all camera modules support this interface. Developers can also use WCAM_VIDIOCSFPS to achieve similar results.
+ * Smaller minfps represent longer exposure times.
+ *
+ */
+#define WCAM_VIDIOCSNIGHTMODE 222
+
+/*!
+ * WCAM_VIDIOCSSTYLE Sets the image style.
+ *
+ * The following styles are supported:
+ *
+ * V4l_STYLE_NORMAL Normal (default value)
+ * V4l_STYLE_BLACK_WHITE Black and white
+ * V4l_STYLE_SEPIA Sepia
+ * V4l_STYLE_SOLARIZE Solarized (not supported by all camera modules)
+ * V4l_STYLE_NEG_ART Negative (not supported by all camera modules)
+ *
+ * The following code segment demonstrates how to set the image style to black and white:
+ *
+ * ioctl(dev, WCAM_VIDIOCSSTYLE, V4l_STYLE_BLACK_WHITE);
+ *
+ */
+#define WCAM_VIDIOCSSTYLE 250
+
+/*!
+ * WCAM_VIDIOCSLIGHT Sets the image light mode
+ *
+ * The following light modes are supported:
+ * V4l_WB_AUTO Auto mode(default)
+ * V4l_WB_DIRECT_SUN Direct sun
+ * V4l_WB_INCANDESCENT Incandescent
+ * V4l_WB_FLUORESCENT Fluorescent
+ *
+ * The following code sets the image light mode to incandescent:
+ * ioctl(dev, WCAM_VIDIOCSLIGHT, V4l_WB_INCANDESCENT);
+ */
+#define WCAM_VIDIOCSLIGHT 251
+
+/*!
+ * WCAM_VIDIOCSBRIGHT Sets the brightness of the image (exposure compensation value)
+ *
+ * parameter value exposure value
+ * -4 -2.0 EV
+ * -3 -1.5 EV
+ * -2 -1.0 EV
+ * -1 -0.5 EV
+ * 0 0.0 EV(default value)
+ * 1 +0.5 EV
+ * 2 +1.0 EV
+ * 3 +1.5 EV
+ * 4 +2.0 EV
+ *
+ * The following code segment sets the brightness to 2.0 EV
+ * ioctl(dev, WCAM_VIDIOCSBRIGHT, 4);
+ */
+#define WCAM_VIDIOCSBRIGHT 252
+
+/*!
+ * Sets the frame buffer count for video mode. The default value is 3.
+ *
+ * Remarks:
+ * The video device driver maintains some memory for buffering image data in the kernel space. When working in video mode,
+ * there are at least 3 frame buffers in the driver. In still mode, there is only 1 frame buffer.
+ * This interface is not open to SDK developers.
+ *
+ */
+#define WCAM_VIDIOCSBUFCOUNT 253
+
+/*!
+ * Gets the current available frames
+ *
+ * The following code demonstrates getting the current available frames:
+ *
+ * struct {int first, last;}cur_frms;
+ * ioctl(dev, WCAM_VIDIOCGCURFRMS, &cur_frms);
+ *
+ * Remarks:
+ * cur_frms.first represents the earliest frame in frame buffer
+ * cur_frms.last represents the latest or most recent frame in frame buffer.
+ */
+#define WCAM_VIDIOCGCURFRMS 254
+
+/*!
+ * Gets the camera sensor type
+ *
+ * unsigned int sensor_type
+ * ioctl(dev, WCAM_VIDIOCGSTYPE, &sensor_type);
+ * if(sensor_type == CAMERA_TYPE_ADCM_2700)
+ * {
+ * printf("Agilent ADCM2700");
+ * }
+ *
+ * Remarks:
+ * For all possible values of sensor_type please refer to the sensor definitions below.
+ */
+#define WCAM_VIDIOCGSTYPE 255
+
+/*!
+ * Sets the image contrast
+ * Not open to SDK developers
+ */
+#define WCAM_VIDIOCSCONTRAST 256
+
+/*!
+ * Sets the flicker frequency(50hz/60hz)
+ * Not open to SDK developers
+ */
+#define WCAM_VIDIOCSFLICKER 257
+
+
+
+typedef enum V4l_NIGHT_MODE
+{
+ V4l_NM_AUTO,
+ V4l_NM_NIGHT,
+ V4l_NM_ACTION
+}V4l_NM;
+
+typedef enum V4l_PIC_STYLE
+{
+ V4l_STYLE_NORMAL,
+ V4l_STYLE_BLACK_WHITE,
+ V4l_STYLE_SEPIA,
+ V4l_STYLE_SOLARIZE,
+ V4l_STYLE_NEG_ART
+}V4l_PIC_STYLE;
+
+typedef enum V4l_PIC_WB
+{
+ V4l_WB_AUTO,
+ V4l_WB_DIRECT_SUN,
+ V4l_WB_INCANDESCENT,
+ V4l_WB_FLUORESCENT
+}V4l_PIC_WB;
+
+
+
+/*!
+ *Image format definitions
+ *Remarks:
+ * Although not all formats are supported by all camera modules, YCBCR422_PLANAR is widely supported.
+ * For detailed information on each format please refer to the Intel PXA27x processor family developer's manual.
+ * http://www.intel.com/design/pca/prodbref/253820.html
+ *
+ */
+#define CAMERA_IMAGE_FORMAT_RAW8 0
+#define CAMERA_IMAGE_FORMAT_RAW9 1
+#define CAMERA_IMAGE_FORMAT_RAW10 2
+
+#define CAMERA_IMAGE_FORMAT_RGB444 3
+#define CAMERA_IMAGE_FORMAT_RGB555 4
+#define CAMERA_IMAGE_FORMAT_RGB565 5
+#define CAMERA_IMAGE_FORMAT_RGB666_PACKED 6
+#define CAMERA_IMAGE_FORMAT_RGB666_PLANAR 7
+#define CAMERA_IMAGE_FORMAT_RGB888_PACKED 8
+#define CAMERA_IMAGE_FORMAT_RGB888_PLANAR 9
+#define CAMERA_IMAGE_FORMAT_RGBT555_0 10 //RGB+Transparent bit 0
+#define CAMERA_IMAGE_FORMAT_RGBT888_0 11
+#define CAMERA_IMAGE_FORMAT_RGBT555_1 12 //RGB+Transparent bit 1
+#define CAMERA_IMAGE_FORMAT_RGBT888_1 13
+
+#define CAMERA_IMAGE_FORMAT_YCBCR400 14
+#define CAMERA_IMAGE_FORMAT_YCBCR422_PACKED 15
+#define CAMERA_IMAGE_FORMAT_YCBCR422_PLANAR 16
+#define CAMERA_IMAGE_FORMAT_YCBCR444_PACKED 17
+#define CAMERA_IMAGE_FORMAT_YCBCR444_PLANAR 18
+
+/*!
+ *VIDIOCCAPTURE arguments
+ */
+#define STILL_IMAGE 1
+#define VIDEO_START 0
+#define VIDEO_STOP -1
+
+/*!
+ *Sensor type definitions
+ */
+#define CAMERA_TYPE_ADCM_2650 1
+#define CAMERA_TYPE_ADCM_2670 2
+#define CAMERA_TYPE_ADCM_2700 3
+#define CAMERA_TYPE_OMNIVISION_9640 4
+#define CAMERA_TYPE_MT9M111 5
+#define CAMERA_TYPE_MT9V111 6
+#define CAMERA_TYPE_ADCM3800 7
+#define CAMERA_TYPE_OV9650 8
+#define CAMERA_TYPE_MAX CAMERA_TYPE_OV9650
+
+
+/*
+ * Definitions of the camera's i2c device
+ */
+#define CAMERA_I2C_WRITEW 101
+#define CAMERA_I2C_WRITEB 102
+#define CAMERA_I2C_READW 103
+#define CAMERA_I2C_READB 104
+#define CAMERA_I2C_DETECTID 105
+
+struct camera_i2c_register {
+ unsigned short addr;
+ union {
+ unsigned short w;
+ unsigned char b;
+ } value;
+};
+
+struct camera_i2c_detectid {
+ int buflen;
+ char data[256];
+};
+
+//End of the camera's i2c device
+
+#endif // __PXA_CAMERA_H__
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-06-12 13:19:26
|
Revision: 1030
http://svn.sourceforge.net/hackndev/?rev=1030&view=rev
Author: happy-slapin
Date: 2007-06-12 06:19:23 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
PXA27x: camera: Added more code
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/media/video/pxa_camera.c
Added Paths:
-----------
linux4palm/linux/trunk/drivers/media/video/pxa_ci_types.h
Modified: linux4palm/linux/trunk/drivers/media/video/pxa_camera.c
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/pxa_camera.c 2007-06-11 22:47:38 UTC (rev 1029)
+++ linux4palm/linux/trunk/drivers/media/video/pxa_camera.c 2007-06-12 13:19:23 UTC (rev 1030)
@@ -11,7 +11,7 @@
* MontaVista Software, Inc.
* so...@mv...
* Motorola Inc.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -79,73 +79,83 @@
#include <linux/videodev.h>
#endif
+#include "pxa_ci_types"
+
/***********************************************************************************
-* Application interface *
-***********************************************************************************/
+ * Application interface *
+ ***********************************************************************************/
static int pxa_camera_open(struct inode *inode, struct file *file)
{
- return -EIO;
+ return -EIO;
}
+
static int pxa_camera_close(struct inode *inode, struct file *file)
{
- return 0;
+ return 0;
}
+
static ssize_t pxa_camera_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
+size_t count, loff_t *ppos)
{
- return 0;
+ return 0;
}
-static unsigned int pxa_camera_poll(struct file *file, poll_table *wait)
+
+static unsigned int pxa_camera_poll(struct file *file, poll_table *wait)
{
- return 0;
+ return 0;
}
+
static int pxa_camera_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+unsigned int cmd, unsigned long arg)
{
- return 0;
+ return 0;
}
+
static int pxa_camera_mmap(struct file *file, struct vm_area_struct *vma)
{
- return -EFAULT;
+ return -EFAULT;
}
+
static ssize_t pxa_camera_write(struct file *file, const char __user *data,
- size_t count, loff_t *ppos)
+size_t count, loff_t *ppos)
{
- return -EINVAL;
+ return -EINVAL;
}
-static struct file_operations vd_fops = {
- .owner = THIS_MODULE,
- .open = pxa_camera_open,
- .release = pxa_camera_close,
- .read = pxa_camera_read,
- .poll = pxa_camera_poll,
- .ioctl = pxa_camera_ioctl,
- .mmap = pxa_camera_mmap,
- .llseek = no_llseek,
- .write = pxa_camera_write,
+
+static struct file_operations vd_fops =
+{
+ .owner = THIS_MODULE,
+ .open = pxa_camera_open,
+ .release = pxa_camera_close,
+ .read = pxa_camera_read,
+ .poll = pxa_camera_poll,
+ .ioctl = pxa_camera_ioctl,
+ .mmap = pxa_camera_mmap,
+ .llseek = no_llseek,
+ .write = pxa_camera_write,
};
-static struct video_device vd = {
- .owner = THIS_MODULE,
- .name = "PXA camera",
- .type = VID_TYPE_CAPTURE,
-/*
- .hardware = VID_HARDWARE_PXA_CAMERA, /* FIXME */
-*/
- .hardware = 0;
- .fops = &vd_fops,
- .minor = -1,
+static struct video_device vd =
+{
+ .owner = THIS_MODULE,
+ .name = "PXA camera",
+ .type = VID_TYPE_CAPTURE,
+ /*
+ .hardware = VID_HARDWARE_PXA_CAMERA, /* FIXME */
+ */
+ .hardware = 0;
+ .fops = &vd_fops,
+ .minor = -1,
};
-
static irqreturn_t pxa_camera_irq(int irq, void *dev_id, struct pt_regs *regs)
{
unsigned int cisr;
@@ -153,38 +163,445 @@
disable_irq(IRQ_CAMERA);
cisr = CISR;
- if (cisr & CI_CISR_SOF)
- CISR |= CI_CISR_SOF;
+ if (cisr & CI_CISR_SOF)
+ CISR |= CI_CISR_SOF;
- if (cisr & CI_CISR_EOF)
- CISR |= CI_CISR_EOF;
+ if (cisr & CI_CISR_EOF)
+ CISR |= CI_CISR_EOF;
enable_irq(IRQ_CAMERA);
return IRQ_HANDLED;
}
+
static int __init pxa_camera_init(void)
{
- if (request_irq(IRQ_CAMERA, pxa_camera_irq, 0, "PXA Camera", &vd)) {
+ if (request_irq(IRQ_CAMERA, pxa_camera_irq, 0, "PXA Camera", &vd))
+ {
dbg_print("Camera interrupt register failed failed number \n");
return -EIO;
- }
- dbg_print ("Camera interrupt register successful \n");
-
- if(video_register_device(&vd, VFL_TYPE_GRABBER, 0) < 0)
- {
- dbg_print("PXA_CAMERA: video_register_device failed\n");
- return -EIO;
- }
+ }
+ dbg_print ("Camera interrupt register successful \n");
- dbg_print("PXA_CAMERA: video_register_device successfully. /dev/video%d \n", 0);
-
- return 0;
+ if(video_register_device(&vd, VFL_TYPE_GRABBER, 0) < 0)
+ {
+ dbg_print("PXA_CAMERA: video_register_device failed\n");
+ return -EIO;
+ }
+
+ dbg_print("PXA_CAMERA: video_register_device successfully. /dev/video%d \n", 0);
+
+ return 0;
}
+
static void __exit pxa_camera_exit(void)
{
- free_irq(IRQ_CAMERA, &vd);
- video_unregister_device(&vd);
+ free_irq(IRQ_CAMERA, &vd);
+ video_unregister_device(&vd);
}
+
+
+//-------------------------------------------------------------------------------------------------------
+// Configuration APIs
+//-------------------------------------------------------------------------------------------------------
+void ci_set_frame_rate(CI_FRAME_CAPTURE_RATE frate)
+{
+ unsigned int value;
+ // write cicr4
+ value = CICR4;
+ value &= ~(CI_CICR4_FR_RATE_SMASK << CI_CICR4_FR_RATE_SHIFT);
+ value |= (unsigned)frate << CI_CICR4_FR_RATE_SHIFT;
+ CICR4 = value;
+}
+
+
+CI_FRAME_CAPTURE_RATE ci_get_frame_rate(void)
+{
+ unsigned int value;
+ value = CICR4;
+ return (CI_FRAME_CAPTURE_RATE)((value >> CI_CICR4_FR_RATE_SHIFT) & CI_CICR4_FR_RATE_SMASK);
+}
+
+
+void ci_set_image_format(CI_IMAGE_FORMAT input_format, CI_IMAGE_FORMAT output_format)
+{
+
+ unsigned int value, tbit, rgbt_conv, rgb_conv, rgb_f, ycbcr_f, rgb_bpp, raw_bpp, cspace;
+ // write cicr1: preserve ppl value and data width value
+ dbg_print("0");
+ value = CICR1;
+ dbg_print("1");
+ value &= ( (CI_CICR1_PPL_SMASK << CI_CICR1_PPL_SHIFT) | ((CI_CICR1_DW_SMASK) << CI_CICR1_DW_SHIFT));
+ tbit = rgbt_conv = rgb_conv = rgb_f = ycbcr_f = rgb_bpp = raw_bpp = cspace = 0;
+ switch(input_format)
+ {
+ case CI_RAW8:
+ cspace = 0;
+ raw_bpp = 0;
+ break;
+ case CI_RAW9:
+ cspace = 0;
+ raw_bpp = 1;
+ break;
+ case CI_RAW10:
+ cspace = 0;
+ raw_bpp = 2;
+ break;
+ case CI_YCBCR422:
+ case CI_YCBCR422_PLANAR:
+ cspace = 2;
+ if(output_format == CI_YCBCR422_PLANAR) {
+ ycbcr_f = 1;
+ }
+ break;
+ case CI_RGB444:
+ cspace = 1;
+ rgb_bpp = 0;
+ break;
+ case CI_RGB555:
+ cspace = 1;
+ rgb_bpp = 1;
+ if(output_format == CI_RGBT555_0) {
+ rgbt_conv = 2;
+ tbit = 0;
+ }
+ else if(output_format == CI_RGBT555_1) {
+ rgbt_conv = 2;
+ tbit = 1;
+ }
+ break;
+ case CI_RGB565:
+ cspace = 1;
+ rgb_bpp = 2;
+ rgb_f = 1;
+ break;
+ case CI_RGB666:
+ cspace = 1;
+ rgb_bpp = 3;
+ if(output_format == CI_RGB666_PACKED) {
+ rgb_f = 1;
+ }
+ break;
+ case CI_RGB888:
+ case CI_RGB888_PACKED:
+ cspace = 1;
+ rgb_bpp = 4;
+ switch(output_format)
+ {
+ case CI_RGB888_PACKED:
+ rgb_f = 1;
+ break;
+ case CI_RGBT888_0:
+ rgbt_conv = 1;
+ tbit = 0;
+ break;
+ case CI_RGBT888_1:
+ rgbt_conv = 1;
+ tbit = 1;
+ break;
+ case CI_RGB666:
+ rgb_conv = 1;
+ break;
+ // RGB666 PACKED - JamesL
+ case CI_RGB666_PACKED:
+ rgb_conv = 1;
+ rgb_f = 1;
+ break;
+ // end
+ case CI_RGB565:
+ dbg_print("format : 565");
+ rgb_conv = 2;
+ break;
+ case CI_RGB555:
+ rgb_conv = 3;
+ break;
+ case CI_RGB444:
+ rgb_conv = 4;
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ dbg_print("2");
+ value |= (tbit==1) ? CI_CICR1_TBIT : 0;
+ value |= rgbt_conv << CI_CICR1_RGBT_CONV_SHIFT;
+ value |= rgb_conv << CI_CICR1_RGB_CONV_SHIFT;
+ value |= (rgb_f==1) ? CI_CICR1_RBG_F : 0;
+ value |= (ycbcr_f==1) ? CI_CICR1_YCBCR_F : 0;
+ value |= rgb_bpp << CI_CICR1_RGB_BPP_SHIFT;
+ value |= raw_bpp << CI_CICR1_RAW_BPP_SHIFT;
+ value |= cspace << CI_CICR1_COLOR_SP_SHIFT;
+ CICR1 = value;
+
+}
+
+
+void ci_set_mode(CI_MODE mode, CI_DATA_WIDTH data_width)
+{
+ unsigned int value;
+
+ // write mode field in cicr0
+ value = CICR0;
+ value &= ~(CI_CICR0_SIM_SMASK << CI_CICR0_SIM_SHIFT);
+ value |= (unsigned int)mode << CI_CICR0_SIM_SHIFT;
+ CICR0 = value;
+
+ // write data width cicr1
+ value = CICR1;
+ value &= ~(CI_CICR1_DW_SMASK << CI_CICR1_DW_SHIFT);
+ value |= ((unsigned)data_width) << CI_CICR1_DW_SHIFT;
+ CICR1 = value;
+ return;
+}
+
+
+void ci_configure_mp(unsigned int ppl, unsigned int lpf, CI_MP_TIMING* timing)
+{
+ unsigned int value;
+ // write ppl field in cicr1
+ value = CICR1;
+ value &= ~(CI_CICR1_PPL_SMASK << CI_CICR1_PPL_SHIFT);
+ value |= (ppl & CI_CICR1_PPL_SMASK) << CI_CICR1_PPL_SHIFT;
+ CICR1 = value;
+
+ // write BLW, ELW in cicr2
+ value = CICR2;
+ value &= ~(CI_CICR2_BLW_SMASK << CI_CICR2_BLW_SHIFT | CI_CICR2_ELW_SMASK << CI_CICR2_ELW_SHIFT );
+ value |= (timing->BLW & CI_CICR2_BLW_SMASK) << CI_CICR2_BLW_SHIFT;
+ CICR2 = value;
+
+ // write BFW, LPF in cicr3
+ value = CICR3;
+ value &= ~(CI_CICR3_BFW_SMASK << CI_CICR3_BFW_SHIFT | CI_CICR3_LPF_SMASK << CI_CICR3_LPF_SHIFT );
+ value |= (timing->BFW & CI_CICR3_BFW_SMASK) << CI_CICR3_BFW_SHIFT;
+ value |= (lpf & CI_CICR3_LPF_SMASK) << CI_CICR3_LPF_SHIFT;
+ CICR3 = value;
+
+}
+
+
+void ci_configure_sp(unsigned int ppl, unsigned int lpf, CI_SP_TIMING* timing)
+{
+ unsigned int value;
+
+ // write ppl field in cicr1
+ value = CICR1;
+ value &= ~(CI_CICR1_PPL_SMASK << CI_CICR1_PPL_SHIFT);
+ value |= (ppl & CI_CICR1_PPL_SMASK) << CI_CICR1_PPL_SHIFT;
+ CICR1 = value;
+
+ // write cicr2
+ value = CICR2;
+ value |= (timing->BLW & CI_CICR2_BLW_SMASK) << CI_CICR2_BLW_SHIFT;
+ value |= (timing->ELW & CI_CICR2_ELW_SMASK) << CI_CICR2_ELW_SHIFT;
+ value |= (timing->HSW & CI_CICR2_HSW_SMASK) << CI_CICR2_HSW_SHIFT;
+ value |= (timing->BFPW & CI_CICR2_BFPW_SMASK) << CI_CICR2_BFPW_SHIFT;
+ value |= (timing->FSW & CI_CICR2_FSW_SMASK) << CI_CICR2_FSW_SHIFT;
+ CICR2 = value;
+
+ // write cicr3
+ value = CICR3;
+ value |= (timing->BFW & CI_CICR3_BFW_SMASK) << CI_CICR3_BFW_SHIFT;
+ value |= (timing->EFW & CI_CICR3_EFW_SMASK) << CI_CICR3_EFW_SHIFT;
+ value |= (timing->VSW & CI_CICR3_VSW_SMASK) << CI_CICR3_VSW_SHIFT;
+ value |= (lpf & CI_CICR3_LPF_SMASK) << CI_CICR3_LPF_SHIFT;
+ CICR3 = value;
+ return;
+}
+
+
+void ci_configure_ms(unsigned int ppl, unsigned int lpf, CI_MS_TIMING* timing)
+{
+ // the operation is same as Master-Parallel
+ ci_configure_mp(ppl, lpf, (CI_MP_TIMING*)timing);
+}
+
+
+void ci_configure_ep(int parity_check)
+{
+ unsigned int value;
+
+ // write parity_enable field in cicr0
+ value = CICR0;
+ if(parity_check)
+ {
+ value |= CI_CICR0_PAR_EN;
+ }
+ else
+ {
+ value &= ~CI_CICR0_PAR_EN;
+ }
+ CICR0 = value;
+ return;
+}
+
+
+void ci_configure_es(int parity_check)
+{
+ // the operationi is same as Embedded-Parallel
+ ci_configure_ep(parity_check);
+}
+
+
+void ci_set_clock(unsigned int clk_regs_base, int pclk_enable, int mclk_enable, unsigned int mclk_khz)
+{
+ unsigned int ciclk, value, div, cccr_l, K;
+
+ // determine the LCLK frequency programmed into the CCCR.
+ cccr_l = (CCCR & 0x0000001F);
+
+ if(cccr_l < 8)
+ K = 1;
+ else if(cccr_l < 17)
+ K = 2;
+ else
+ K = 3;
+
+ ciclk = (13 * cccr_l) / K;
+
+ div = (ciclk + mclk_khz) / ( 2 * mclk_khz ) - 1;
+ dbg_print("cccr=%xciclk=%d,cccr_l=%d,K=%d,div=%d,mclk=%d\n",CCCR,ciclk,cccr_l,K,div,mclk_khz);
+ // write cicr4
+ value = CICR4;
+ value &= ~(CI_CICR4_PCLK_EN | CI_CICR4_MCLK_EN | CI_CICR4_DIV_SMASK<<CI_CICR4_DIV_SHIFT);
+ value |= (pclk_enable) ? CI_CICR4_PCLK_EN : 0;
+ value |= (mclk_enable) ? CI_CICR4_MCLK_EN : 0;
+ value |= div << CI_CICR4_DIV_SHIFT;
+ CICR4 = value;
+ return;
+}
+
+
+void ci_set_polarity(int pclk_sample_falling, int hsync_active_low, int vsync_active_low)
+{
+ unsigned int value;
+ dbg_print("");
+
+ // write cicr4
+ value = CICR4;
+ value &= ~(CI_CICR4_PCP | CI_CICR4_HSP | CI_CICR4_VSP);
+ value |= (pclk_sample_falling)? CI_CICR4_PCP : 0;
+ value |= (hsync_active_low) ? CI_CICR4_HSP : 0;
+ value |= (vsync_active_low) ? CI_CICR4_VSP : 0;
+ CICR4 = value;
+ return;
+}
+
+
+void ci_set_fifo(unsigned int timeout, CI_FIFO_THRESHOLD threshold, int fifo1_enable,
+int fifo2_enable)
+{
+ unsigned int value;
+ dbg_print("");
+ // write citor
+ CITOR = timeout;
+
+ // write cifr: always enable fifo 0! also reset input fifo
+ value = CIFR;
+ value &= ~(CI_CIFR_FEN0 | CI_CIFR_FEN1 | CI_CIFR_FEN2 | CI_CIFR_RESETF |
+ CI_CIFR_THL_0_SMASK<<CI_CIFR_THL_0_SHIFT);
+ value |= (unsigned int)threshold << CI_CIFR_THL_0_SHIFT;
+ value |= (fifo1_enable) ? CI_CIFR_FEN1 : 0;
+ value |= (fifo2_enable) ? CI_CIFR_FEN2 : 0;
+ value |= CI_CIFR_RESETF | CI_CIFR_FEN0;
+ CIFR = value;
+}
+
+
+void ci_reset_fifo()
+{
+ unsigned int value;
+ value = CIFR;
+ value |= CI_CIFR_RESETF;
+ CIFR = value;
+}
+
+
+void ci_set_int_mask(unsigned int mask)
+{
+ unsigned int value;
+
+ // write mask in cicr0
+ value = CICR0;
+ value &= ~CI_CICR0_INTERRUPT_MASK;
+ value |= (mask & CI_CICR0_INTERRUPT_MASK);
+ dbg_print("-----------value=0x%x\n",value);
+ CICR0 = value;
+ return;
+}
+
+
+unsigned int ci_get_int_mask()
+{
+ unsigned int value;
+
+ // write mask in cicr0
+ value = CICR0;
+ return (value & CI_CICR0_INTERRUPT_MASK);
+}
+
+
+void ci_clear_int_status(unsigned int status)
+{
+ // write 1 to clear
+ CISR = status;
+}
+
+
+unsigned int ci_get_int_status()
+{
+ int value;
+
+ value = CISR;
+
+ return value;
+}
+
+
+void ci_set_reg_value(unsigned int reg_offset, unsigned int value)
+{
+ switch(reg_offset)
+ {
+ case 0:
+ CICR0 = value;
+ break;
+ case 1:
+ CICR1 = value;
+ break;
+ case 2:
+ CICR2 = value;
+ break;
+ case 3:
+ CICR3 = value;
+ break;
+ case 4:
+ CICR4 = value;
+ break;
+ case 5:
+ CISR = value;
+ break;
+ case 6:
+ CIFR = value;
+ break;
+ case 7:
+ CITOR = value;
+ break;
+ }
+}
+
+
+int ci_get_reg_value(unsigned int reg_offset)
+{
+
+ unsigned values[] = {CICR0, CICR1, CICR2, CICR3, CICR4, CISR, CIFR, CITOR};
+
+ if(reg_offset >=0 && reg_offset <= 7)
+ return values[reg_offset];
+ else
+ return CISR;
+}
Added: linux4palm/linux/trunk/drivers/media/video/pxa_ci_types.h
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/pxa_ci_types.h (rev 0)
+++ linux4palm/linux/trunk/drivers/media/video/pxa_ci_types.h 2007-06-12 13:19:23 UTC (rev 1030)
@@ -0,0 +1,692 @@
+/*
+ * camera.h
+ *
+ * Bulverde Processor Camera Interface driver.
+ *
+ * Copyright (C) 2003, Intel Corporation
+ * Copyright (C) 2003, Montavista Software Inc.
+ * Copyright (C) 2003-2006 Motorola Inc.
+ *
+ * Author: Intel Corporation Inc.
+ * MontaVista Software, Inc.
+ * so...@mv...
+ * Motorola Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+
+Revision History:
+ Modification Tracking
+ Date Description of Changes
+ ------------ -------------------------
+ 12/19/2003 Created
+ 02/26/2004 Update algorithm for DMA transfer
+ 04/12/2006 fix sensor name
+
+*/
+
+/*================================================================================
+ INCLUDE FILES
+================================================================================*/
+#ifndef PXA_CI_TYPES_H_
+#define PXA_CI_TYPES_H_
+
+#include <linux/pxa_camera.h>
+
+#define DEBUG 1
+
+/*
+Bpp definition
+*/
+
+#define YUV422_BPP 16
+#define RGB565_BPP 16
+#define RGB666_UNPACKED_BPP 32
+#define RGB666_PACKED_BPP 24
+
+//---------------------------------------------------------------------------
+// Register definitions
+//---------------------------------------------------------------------------
+
+enum CI_REGBITS_CICR0
+{
+ CI_CICR0_FOM = 0x00000001,
+ CI_CICR0_EOFM = 0x00000002,
+ CI_CICR0_SOFM = 0x00000004,
+ CI_CICR0_CDM = 0x00000008,
+ CI_CICR0_QDM = 0x00000010,
+ CI_CICR0_PERRM = 0x00000020,
+ CI_CICR0_EOLM = 0x00000040,
+ CI_CICR0_FEM = 0x00000080,
+ CI_CICR0_RDAVM = 0x00000100,
+ CI_CICR0_TOM = 0x00000200,
+ CI_CICR0_RESERVED = 0x03FFFC00,
+ CI_CICR0_SIM_SHIFT = 24,
+ CI_CICR0_SIM_SMASK = 0x7,
+ CI_CICR0_DIS = 0x08000000,
+ CI_CICR0_ENB = 0x10000000,
+ CI_CICR0_SL_CAP_EN = 0x20000000,
+ CI_CICR0_PAR_EN = 0x40000000,
+ CI_CICR0_DMA_EN = 0x80000000,
+ CI_CICR0_INTERRUPT_MASK = 0x3FF
+};
+
+enum CI_REGBITS_CICR1
+{
+ CI_CICR1_DW_SHIFT = 0,
+ CI_CICR1_DW_SMASK = 0x7,
+ CI_CICR1_COLOR_SP_SHIFT = 3,
+ CI_CICR1_COLOR_SP_SMASK = 0x3,
+ CI_CICR1_RAW_BPP_SHIFT = 5,
+ CI_CICR1_RAW_BPP_SMASK = 0x3,
+ CI_CICR1_RGB_BPP_SHIFT = 7,
+ CI_CICR1_RGB_BPP_SMASK = 0x7,
+ CI_CICR1_YCBCR_F = 0x00000400,
+ CI_CICR1_RBG_F = 0x00000800,
+ CI_CICR1_RGB_CONV_SHIFT = 12,
+ CI_CICR1_RGB_CONV_SMASK = 0x7,
+ CI_CICR1_PPL_SHIFT = 15,
+ CI_CICR1_PPL_SMASK = 0x7FF,
+ CI_CICR1_RESERVED = 0x1C000000,
+ CI_CICR1_RGBT_CONV_SHIFT= 29,
+ CI_CICR1_RGBT_CONV_SMASK= 0x3,
+ CI_CICR1_TBIT = 0x80000000
+};
+
+enum CI_REGBITS_CICR2
+{
+ CI_CICR2_FSW_SHIFT = 0,
+ CI_CICR2_FSW_SMASK = 0x3,
+ CI_CICR2_BFPW_SHIFT= 3,
+ CI_CICR2_BFPW_SMASK= 0x3F,
+ CI_CICR2_RESERVED = 0x00000200,
+ CI_CICR2_HSW_SHIFT = 10,
+ CI_CICR2_HSW_SMASK = 0x3F,
+ CI_CICR2_ELW_SHIFT = 16,
+ CI_CICR2_ELW_SMASK = 0xFF,
+ CI_CICR2_BLW_SHIFT = 24,
+ CI_CICR2_BLW_SMASK = 0xFF
+};
+
+enum CI_REGBITS_CICR3
+{
+ CI_CICR3_LPF_SHIFT = 0,
+ CI_CICR3_LPF_SMASK = 0x7FF,
+ CI_CICR3_VSW_SHIFT = 11,
+ CI_CICR3_VSW_SMASK = 0x1F,
+ CI_CICR3_EFW_SHIFT = 16,
+ CI_CICR3_EFW_SMASK = 0xFF,
+ CI_CICR3_BFW_SHIFT = 24,
+ CI_CICR3_BFW_SMASK = 0xFF
+};
+
+enum CI_REGBITS_CICR4
+{
+ CI_CICR4_DIV_SHIFT = 0,
+ CI_CICR4_DIV_SMASK = 0xFF,
+ CI_CICR4_FR_RATE_SHIFT = 8,
+ CI_CICR4_FR_RATE_SMASK = 0x7,
+ CI_CICR4_RESERVED1 = 0x0007F800,
+ CI_CICR4_MCLK_EN = 0x00080000,
+ CI_CICR4_VSP = 0x00100000,
+ CI_CICR4_HSP = 0x00200000,
+ CI_CICR4_PCP = 0x00400000,
+ CI_CICR4_PCLK_EN = 0x00800000,
+ CI_CICR4_RESERVED2 = 0xFF000000,
+ CI_CICR4_RESERVED = CI_CICR4_RESERVED1 | CI_CICR4_RESERVED2
+};
+
+enum CI_REGBITS_CISR
+{
+ CI_CISR_IFO_0 = 0x00000001,
+ CI_CISR_IFO_1 = 0x00000002,
+ CI_CISR_IFO_2 = 0x00000004,
+ CI_CISR_EOF = 0x00000008,
+ CI_CISR_SOF = 0x00000010,
+ CI_CISR_CDD = 0x00000020,
+ CI_CISR_CQD = 0x00000040,
+ CI_CISR_PAR_ERR = 0x00000080,
+ CI_CISR_EOL = 0x00000100,
+ CI_CISR_FEMPTY_0 = 0x00000200,
+ CI_CISR_FEMPTY_1 = 0x00000400,
+ CI_CISR_FEMPTY_2 = 0x00000800,
+ CI_CISR_RDAV_0 = 0x00001000,
+ CI_CISR_RDAV_1 = 0x00002000,
+ CI_CISR_RDAV_2 = 0x00004000,
+ CI_CISR_FTO = 0x00008000,
+ CI_CISR_RESERVED = 0xFFFF0000
+};
+
+enum CI_REGBITS_CIFR
+{
+ CI_CIFR_FEN0 = 0x00000001,
+ CI_CIFR_FEN1 = 0x00000002,
+ CI_CIFR_FEN2 = 0x00000004,
+ CI_CIFR_RESETF = 0x00000008,
+ CI_CIFR_THL_0_SHIFT= 4,
+ CI_CIFR_THL_0_SMASK= 0x3,
+ CI_CIFR_RESERVED1 = 0x000000C0,
+ CI_CIFR_FLVL0_SHIFT= 8,
+ CI_CIFR_FLVL0_SMASK= 0xFF,
+ CI_CIFR_FLVL1_SHIFT= 16,
+ CI_CIFR_FLVL1_SMASK= 0x7F,
+ CI_CIFR_FLVL2_SHIFT= 23,
+ CI_CIFR_FLVL2_SMASK= 0x7F,
+ CI_CIFR_RESERVED2 = 0xC0000000,
+ CI_CIFR_RESERVED = CI_CIFR_RESERVED1 | CI_CIFR_RESERVED2
+};
+
+//---------------------------------------------------------------------------
+// Parameter Type definitions
+//---------------------------------------------------------------------------
+typedef enum
+{
+ CI_RAW8 = 0, //RAW
+ CI_RAW9,
+ CI_RAW10,
+ CI_YCBCR422, //YCBCR
+ CI_YCBCR422_PLANAR, //YCBCR Planaried
+ CI_RGB444, //RGB
+ CI_RGB555,
+ CI_RGB565,
+ CI_RGB666,
+ CI_RGB888,
+ CI_RGBT555_0, //RGB+Transparent bit 0
+ CI_RGBT888_0,
+ CI_RGBT555_1, //RGB+Transparent bit 1
+ CI_RGBT888_1,
+ CI_RGB666_PACKED, //RGB Packed
+ CI_RGB888_PACKED,
+ CI_INVALID_FORMAT = 0xFF
+} CI_IMAGE_FORMAT;
+
+typedef enum
+{
+ CI_INTSTATUS_IFO_0 = 0x00000001,
+ CI_INTSTATUS_IFO_1 = 0x00000002,
+ CI_INTSTATUS_IFO_2 = 0x00000004,
+ CI_INTSTATUS_EOF = 0x00000008,
+ CI_INTSTATUS_SOF = 0x00000010,
+ CI_INTSTATUS_CDD = 0x00000020,
+ CI_INTSTATUS_CQD = 0x00000040,
+ CI_INTSTATUS_PAR_ERR = 0x00000080,
+ CI_INTSTATUS_EOL = 0x00000100,
+ CI_INTSTATUS_FEMPTY_0 = 0x00000200,
+ CI_INTSTATUS_FEMPTY_1 = 0x00000400,
+ CI_INTSTATUS_FEMPTY_2 = 0x00000800,
+ CI_INTSTATUS_RDAV_0 = 0x00001000,
+ CI_INTSTATUS_RDAV_1 = 0x00002000,
+ CI_INTSTATUS_RDAV_2 = 0x00004000,
+ CI_INTSTATUS_FTO = 0x00008000,
+ CI_INTSTATUS_ALL = 0x0000FFFF
+} CI_INTERRUPT_STATUS;
+
+typedef enum
+{
+ CI_INT_IFO = 0x00000001,
+ CI_INT_EOF = 0x00000002,
+ CI_INT_SOF = 0x00000004,
+ CI_INT_CDD = 0x00000008,
+ CI_INT_CQD = 0x00000010,
+ CI_INT_PAR_ERR = 0x00000020,
+ CI_INT_EOL = 0x00000040,
+ CI_INT_FEMPTY = 0x00000080,
+ CI_INT_RDAV = 0x00000100,
+ CI_INT_FTO = 0x00000200,
+ CI_INT_ALL = 0x000003FF
+} CI_INTERRUPT_MASK;
+#define CI_INT_MAX 10
+
+typedef enum CI_MODE
+{
+ CI_MODE_MP, // Master-Parallel
+ CI_MODE_SP, // Slave-Parallel
+ CI_MODE_MS, // Master-Serial
+ CI_MODE_EP, // Embedded-Parallel
+ CI_MODE_ES // Embedded-Serial
+} CI_MODE;
+
+typedef enum
+{
+ CI_FR_ALL = 0, // Capture all incoming frames
+ CI_FR_1_2, // Capture 1 out of every 2 frames
+ CI_FR_1_3, // Capture 1 out of every 3 frames
+ CI_FR_1_4,
+ CI_FR_1_5,
+ CI_FR_1_6,
+ CI_FR_1_7,
+ CI_FR_1_8
+} CI_FRAME_CAPTURE_RATE;
+
+typedef enum
+{
+ CI_FIFO_THL_32 = 0,
+ CI_FIFO_THL_64,
+ CI_FIFO_THL_96
+} CI_FIFO_THRESHOLD;
+
+typedef struct
+{
+ unsigned int BFW;
+ unsigned int BLW;
+} CI_MP_TIMING, CI_MS_TIMING;
+
+typedef struct
+{
+ unsigned int BLW;
+ unsigned int ELW;
+ unsigned int HSW;
+ unsigned int BFPW;
+ unsigned int FSW;
+ unsigned int BFW;
+ unsigned int EFW;
+ unsigned int VSW;
+} CI_SP_TIMING;
+
+typedef enum
+{
+ CI_DATA_WIDTH4 = 0x0,
+ CI_DATA_WIDTH5 = 0x1,
+ CI_DATA_WIDTH8 = 0x2,
+ CI_DATA_WIDTH9 = 0x3,
+ CI_DATA_WIDTH10= 0x4
+} CI_DATA_WIDTH;
+
+//-------------------------------------------------------------------------------------------------------
+// Configuration APIs
+//-------------------------------------------------------------------------------------------------------
+
+void ci_set_frame_rate(CI_FRAME_CAPTURE_RATE frate);
+CI_FRAME_CAPTURE_RATE ci_get_frame_rate(void);
+void ci_set_image_format(CI_IMAGE_FORMAT input_format, CI_IMAGE_FORMAT output_format);
+void ci_set_mode(CI_MODE mode, CI_DATA_WIDTH data_width);
+void ci_configure_mp(unsigned int PPL, unsigned int LPF, CI_MP_TIMING* timing);
+void ci_configure_sp(unsigned int PPL, unsigned int LPF, CI_SP_TIMING* timing);
+void ci_configure_ms(unsigned int PPL, unsigned int LPF, CI_MS_TIMING* timing);
+void ci_configure_ep(int parity_check);
+void ci_configure_es(int parity_check);
+unsigned int ci_set_clock(unsigned int clk_regs_base, int pclk_enable, int mclk_enable, unsigned int mclk_mhz);
+unsigned int ci_get_clock(void);
+void ci_set_polarity(int pclk_sample_falling, int hsync_active_low, int vsync_active_low);
+void ci_set_fifo( unsigned int timeout, CI_FIFO_THRESHOLD threshold, int fifo1_enable,
+int fifo2_enable);
+void ci_set_int_mask( unsigned int mask);
+void ci_clear_int_status( unsigned int status);
+void ci_set_reg_value( unsigned int reg_offset, unsigned int value);
+int ci_get_reg_value(unsigned int reg_offset);
+
+void ci_reset_fifo(void);
+unsigned int ci_get_int_mask(void);
+unsigned int ci_get_int_status(void);
+void ci_slave_capture_enable(void);
+void ci_slave_capture_disable(void);
+
+//-------------------------------------------------------------------------------------------------------
+// Control APIs
+//-------------------------------------------------------------------------------------------------------
+int ci_init(void);
+void ci_deinit(void);
+void ci_enable( int dma_en);
+int ci_disable(int quick);
+
+//debug
+void ci_dump(void);
+// IRQ
+void pxa_camera_irq(int irq, void *dev_id, struct pt_regs *regs);
+void pxa_fvgpio_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+
+#define err_print(fmt, args...) printk(KERN_ERR "fun %s "fmt"\n", __FUNCTION__, ##args)
+
+#ifdef DEBUG
+
+#define dbg_print(fmt, args...) printk(KERN_INFO "fun %s "fmt"\n", __FUNCTION__, ##args)
+
+#if DEBUG > 1
+#define ddbg_print(fmt, args...) printk(KERN_INFO "fun %s "fmt"\n", __FUNCTION__, ##args)
+#else
+#define ddbg_print(fmt, args...) ;
+#endif
+
+#else
+
+#define dbg_print(fmt, args...) ;
+#define ddbg_print(fmt, args...) ;
+#endif
+
+ /* subject to change */
+#define VID_HARDWARE_PXA_CAMERA 50
+
+#define STATUS_FAILURE (0)
+#define STATUS_SUCCESS (1)
+#define STATUS_WRONG_PARAMETER -1
+
+/*
+Macros
+*/
+
+/*
+Image format definition
+*/
+//#define CAMERA_IMAGE_FORMAT_MAX CAMERA_IMAGE_FORMAT_YCBCR444_PLANAR
+
+// Interrupt mask
+#define CAMERA_INTMASK_FIFO_OVERRUN 0x0001
+#define CAMERA_INTMASK_END_OF_FRAME 0x0002
+#define CAMERA_INTMASK_START_OF_FRAME 0x0004
+#define CAMERA_INTMASK_CI_DISABLE_DONE 0x0008
+#define CAMERA_INTMASK_CI_QUICK_DISABLE 0x0010
+#define CAMERA_INTMASK_PARITY_ERROR 0x0020
+#define CAMERA_INTMASK_END_OF_LINE 0x0040
+#define CAMERA_INTMASK_FIFO_EMPTY 0x0080
+#define CAMERA_INTMASK_RCV_DATA_AVALIBLE 0x0100
+#define CAMERA_INTMASK_TIME_OUT 0x0200
+#define CAMERA_INTMASK_END_OF_DMA 0x0400
+
+// Interrupt status
+#define CAMERA_INTSTATUS_FIFO_OVERRUN_0 0x00000001
+#define CAMERA_INTSTATUS_FIFO_OVERRUN_1 0x00000002
+#define CAMERA_INTSTATUS_FIFO_OVERRUN_2 0x00000004
+#define CAMERA_INTSTATUS_END_OF_FRAME 0x00000008
+#define CAMERA_INTSTATUS_START_OF_FRAME 0x00000010
+#define CAMERA_INTSTATUS_CI_DISABLE_DONE 0x00000020
+#define CAMERA_INTSTATUS_CI_QUICK_DISABLE 0x00000040
+#define CAMERA_INTSTATUS_PARITY_ERROR 0x00000080
+#define CAMERA_INTSTATUS_END_OF_LINE 0x00000100
+#define CAMERA_INTSTATUS_FIFO_EMPTY_0 0x00000200
+#define CAMERA_INTSTATUS_FIFO_EMPTY_1 0x00000400
+#define CAMERA_INTSTATUS_FIFO_EMPTY_2 0x00000800
+#define CAMERA_INTSTATUS_RCV_DATA_AVALIBLE_0 0x00001000
+#define CAMERA_INTSTATUS_RCV_DATA_AVALIBLE_1 0x00002000
+#define CAMERA_INTSTATUS_RCV_DATA_AVALIBLE_2 0x00004000
+#define CAMERA_INTSTATUS_TIME_OUT 0x00008000
+#define CAMERA_INTSTATUS_END_OF_DMA 0x00010000
+
+// Capture status
+#define CAMERA_STATUS_VIDEO_CAPTURE_IN_PROCESS 0x0001
+#define CAMERA_STATUS_RING_BUFFER_FULL 0x0002
+
+#define CAMERA_ERROR_NONE 0
+#define CAMERA_ERROR_FVNOTSYNC -1
+#define CAMERA_ERROR_FIFONOTEMPTY -2
+#define CAMERA_ERROR_UNEXPECTEDINT -3
+
+/*
+Structures
+*/
+typedef struct camera_context_s camera_context_t, *p_camera_context_t;
+
+typedef struct
+{
+ int (*init)(p_camera_context_t context);
+ int (*deinit)(p_camera_context_t);
+ int (*set_capture_format)(p_camera_context_t);
+ int (*start_capture)(p_camera_context_t, unsigned int frames);
+ int (*stop_capture)(p_camera_context_t);
+ int (*command)(p_camera_context_t, unsigned int cmd, void *param);
+ int (*pm_management)(p_camera_context_t, int suspend);
+} camera_function_t, *p_camera_function_t;
+// context
+
+struct camera_context_s
+{
+ // syncronization stuff
+ atomic_t refcount;
+
+ /*
+ * DRIVER FILLED PARAMTER
+ */
+
+ // sensor info
+ unsigned int sensor_type;
+
+ // capture image info
+ unsigned int capture_width;
+ unsigned int capture_height;
+ unsigned int sensor_width;
+ unsigned int sensor_height;
+ unsigned int still_width;
+ unsigned int still_height;
+
+ unsigned int camera_width;
+ unsigned int camera_height;
+
+ unsigned int capture_input_format;
+ unsigned int capture_output_format;
+ unsigned int still_input_format;
+ unsigned int still_output_format;
+
+ unsigned int capture_digital_zoom;
+ unsigned int still_digital_zoom;
+
+ int plane_number;
+
+ int still_image_mode;
+ int camera_mode;
+
+ int jpeg_quality;
+
+ int waiting_frame;
+ int fv_rising_edge;
+ int preferred_block_num;
+ int still_image_rdy;
+ int task_waiting;
+ int detected_sensor_type;
+
+ V4l_PIC_STYLE capture_style;
+ V4l_PIC_WB capture_light;
+ int capture_bright;
+ int capture_contrast;
+ int flicker_freq;
+
+ struct video_capability vc;
+
+ // frame rate control
+ unsigned int frame_rate;
+ unsigned int fps;
+ unsigned int mini_fps;
+
+ unsigned int mclk;
+
+ // ring buffers
+ // note: must pass in 8 bytes aligned address
+ void *buffer_virtual;
+ void *buffer_physical;
+ unsigned int buf_size;
+
+ // memory for dma descriptors, layout:
+ // dma descriptor chain 0,
+ // dma descriptor chain 1,
+ // ...
+ void *dma_descriptors_virtual;
+ void *dma_descriptors_physical;
+ unsigned int dma_descriptors_size;
+
+ // os mapped register address
+ unsigned int clk_reg_base;
+ unsigned int ost_reg_base;
+ unsigned int gpio_reg_base;
+ unsigned int ci_reg_base;
+ unsigned int board_reg_base;
+
+ // function dispatch table
+ p_camera_function_t camera_functions;
+
+ /*
+ * FILLED PARAMTER
+ */
+ int dma_channels[3];
+ unsigned int capture_status;
+
+ unsigned planeOffset[VIDEO_MAX_FRAME][3];
+ unsigned planeBytes[VIDEO_MAX_FRAME][3];
+
+ /*
+ * INTERNALLY USED: DON'T TOUCH!
+ */
+ unsigned int block_number, block_size, block_number_max;
+ unsigned int block_header, block_tail;
+ unsigned int fifo0_descriptors_virtual, fifo0_descriptors_physical;
+ unsigned int fifo1_descriptors_virtual, fifo1_descriptors_physical;
+ unsigned int fifo2_descriptors_virtual, fifo2_descriptors_physical;
+ unsigned int fifo0_num_descriptors;
+ unsigned int fifo1_num_descriptors;
+ unsigned int fifo2_num_descriptors;
+ unsigned int fifo0_transfer_size;
+ unsigned int fifo1_transfer_size;
+ unsigned int fifo2_transfer_size;
+
+ struct page **page_array;
+
+ unsigned int pages_allocated;
+ unsigned int page_aligned_block_size;
+ unsigned int pages_per_block;
+ unsigned int pages_per_fifo0;
+ unsigned int pages_per_fifo1;
+ unsigned int pages_per_fifo2;
+
+ #ifdef CONFIG_DPM
+ struct pm_dev *pmdev;
+ #endif
+ int dma_started;
+};
+
+/*
+Prototypes
+*/
+/***********************************************************************
+ *
+ * Init/Deinit APIs
+ *
+ ***********************************************************************/
+// Setup the sensor type, configure image capture format (RGB, yuv 444, yuv 422, yuv 420, packed | planar, MJPEG) regardless
+// of current operating mode (i.e. sets mode for both still capture and video capture)
+int camera_init( p_camera_context_t camera_context );
+
+// Power off sensor
+int camera_deinit( p_camera_context_t camera_context );
+
+/***********************************************************************
+ *
+ * Capture APIs
+ *
+ ***********************************************************************/
+// Set the image format
+int camera_set_capture_format( p_camera_context_t camera_context, int set_sensor );
+
+// take a picture and copy it into the ring buffer
+int camera_capture_still_image( p_camera_context_t camera_context, unsigned int block_id );
+
+// capture motion video and copy it the ring buffer
+int camera_start_video_capture( p_camera_context_t camera_context, unsigned int block_id, int set_sensor);
+
+// disable motion video image capture
+void camera_stop_video_capture( p_camera_context_t camera_context );
+
+// skip frame before capture video or still image
+void camera_skip_frame( p_camera_context_t camera_context, int skip_frame_num );
+
+int camera_func_ov9640_command(p_camera_context_t camera_context, unsigned int cmd, void *param);
+
+/***********************************************************************
+ *
+ * Flow Control APIs
+ *
+ ***********************************************************************/
+// continue capture image to next available buffer
+// Returns the continued buffer id, -1 means buffer full and no transfer started
+void camera_continue_transfer( p_camera_context_t camera_context );
+
+// Return 1: there is available buffer, 0: buffer is full
+int camera_next_buffer_available( p_camera_context_t camera_context );
+
+// Application supplies the FrameBufferID to the driver to tell it that the application has completed processing of the given frame buffer, and that buffer is now available for re-use.
+void camera_release_frame_buffer( p_camera_context_t camera_context, unsigned int frame_buffer_id );
+
+// Returns the FrameBufferID for the first filled frame
+// Note: -1 represents buffer empty
+int camera_get_first_frame_buffer_id( p_camera_context_t camera_context );
+
+/*
+Returns the FrameBufferID for the last filled frame, this would be used if we were polling for image completion data,
+or we wanted to make sure there were no frames waiting for us to process.
+Note: -1 represents buffer empty
+*/
+int camera_get_last_frame_buffer_id( p_camera_context_t camera_context );
+
+/***********************************************************************
+ *
+ * Buffer Info APIs
+ *
+ ***********************************************************************/
+// Return: the number of frame buffers allocated for use.
+unsigned int camera_get_num_frame_buffers( p_camera_context_t camera_context );
+
+/*
+FrameBufferID is a number between 0 and N-1, where N is the total number of frame buffers in use.
+Returns the address of the given frame buffer.
+The application will call this once for each frame buffer at application initialization only.
+*/
+void* camera_get_frame_buffer_addr( p_camera_context_t camera_context, unsigned int frame_buffer_id );
+
+// Return the block id
+int camera_get_frame_buffer_id( p_camera_context_t camera_context, void* address );
+
+/***********************************************************************
+ *
+ * Frame rate APIs
+ *
+ ***********************************************************************/
+// Set desired frame rate
+void camera_set_capture_frame_rate( p_camera_context_t camera_context );
+
+// return current setting
+void camera_get_capture_frame_rate( p_camera_context_t camera_context );
+
+/***********************************************************************
+ *
+ * Interrupt APIs
+ *
+ ***********************************************************************/
+// set interrupt mask
+void camera_set_int_mask( p_camera_context_t camera_context, unsigned int mask );
+
+// get interrupt mask
+unsigned int camera_get_int_mask( p_camera_context_t camera_context );
+
+// clear interrupt status
+void camera_clear_int_status( p_camera_context_t camera_context, unsigned int status );
+
+// gpio init
+void camera_gpio_init(void);
+void camera_gpio_deinit(void);
+
+// ci functions
+void ci_reset(void);
+
+// dma functions
+extern void start_dma_transfer(p_camera_context_t camera_context, unsigned block_id);
+extern void stop_dma_transfer(p_camera_context_t camera_context);
+extern int camera_ring_buf_init(p_camera_context_t camera_context);
+
+// power management deep idle
+#define USE_CAM_IPM_HOOK
+extern int cam_ipm_hook(void);
+extern void cam_ipm_unhook(void);
+
+// lock functions
+extern void camera_lock(void);
+extern void camera_unlock(void);
+extern int camera_trylock(void);
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-06-11 22:47:40
|
Revision: 1029
http://svn.sourceforge.net/hackndev/?rev=1029&view=rev
Author: happy-slapin
Date: 2007-06-11 15:47:38 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
PXA27x: adding driver template to support PXA camera.
Don't even try to use it - I just started flushing my development, otherwise
it seems to be endless.
I use vivi.c and Motorola 2.4 code + PXA27x spec to implement this, so consider
this mostly refactoring work.
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/media/video/Kconfig
linux4palm/linux/trunk/drivers/media/video/Makefile
Added Paths:
-----------
linux4palm/linux/trunk/drivers/media/video/pxa_camera.c
Modified: linux4palm/linux/trunk/drivers/media/video/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/Kconfig 2007-06-09 03:12:45 UTC (rev 1028)
+++ linux4palm/linux/trunk/drivers/media/video/Kconfig 2007-06-11 22:47:38 UTC (rev 1029)
@@ -763,4 +763,10 @@
endmenu # V4L USB devices
+config PXACI
+ depends on VIDEO_DEV
+ tristate "Camera Interface for PXA27x"
+
+endchoice
+
endmenu
Modified: linux4palm/linux/trunk/drivers/media/video/Makefile
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/Makefile 2007-06-09 03:12:45 UTC (rev 1028)
+++ linux4palm/linux/trunk/drivers/media/video/Makefile 2007-06-11 22:47:38 UTC (rev 1029)
@@ -111,5 +111,6 @@
obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
obj-$(CONFIG_VIDEO_VIVI) += vivi.o
+obj-$(CONFIG_PXACI) += pxa_camera.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
Added: linux4palm/linux/trunk/drivers/media/video/pxa_camera.c
===================================================================
--- linux4palm/linux/trunk/drivers/media/video/pxa_camera.c (rev 0)
+++ linux4palm/linux/trunk/drivers/media/video/pxa_camera.c 2007-06-11 22:47:38 UTC (rev 1029)
@@ -0,0 +1,190 @@
+/*
+ * pxa_camera.c
+ *
+ * Bulverde Processor Camera Interface driver.
+ *
+ * Copyright (C) 2003, Intel Corporation
+ * Copyright (C) 2003, Montavista Software Inc.
+ * Copyright (C) 2003-2006 Motorola Inc.
+ *
+ * Author: Intel Corporation Inc.
+ * MontaVista Software, Inc.
+ * so...@mv...
+ * Motorola Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * V4L2 conversion (C) 2007 Sergey Lapin
+ */
+#warning "Not finished yet, don't try to use!!!"
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/random.h>
+#include <linux/version.h>
+#include <linux/videodev2.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/proc_fs.h>
+#include <linux/ctype.h>
+#include <linux/pagemap.h>
+#include <linux/wrapper.h>
+#include <linux/videodev2.h>
+#include <linux/pci.h>
+#include <linux/pm.h>
+#include <linux/poll.h>
+#include <linux/wait.h>
+
+#include <linux/types.h>
+#include <asm/mach-types.h>
+#include <asm/io.h>
+#include <asm/semaphore.h>
+#include <asm/hardware.h>
+#include <asm/dma.h>
+#include <asm/arch/irqs.h>
+#include <asm/irq.h>
+
+#include <asm/arch/pxa-regs.h>
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+#endif
+
+/***********************************************************************************
+* Application interface *
+***********************************************************************************/
+
+static int pxa_camera_open(struct inode *inode, struct file *file)
+{
+ return -EIO;
+}
+
+static int pxa_camera_close(struct inode *inode, struct file *file)
+{
+ return 0;
+}
+
+static ssize_t pxa_camera_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ return 0;
+}
+
+static unsigned int pxa_camera_poll(struct file *file, poll_table *wait)
+{
+ return 0;
+}
+
+static int pxa_camera_ioctl(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
+ return 0;
+}
+
+static int pxa_camera_mmap(struct file *file, struct vm_area_struct *vma)
+{
+ return -EFAULT;
+}
+
+static ssize_t pxa_camera_write(struct file *file, const char __user *data,
+ size_t count, loff_t *ppos)
+{
+ return -EINVAL;
+}
+
+static struct file_operations vd_fops = {
+ .owner = THIS_MODULE,
+ .open = pxa_camera_open,
+ .release = pxa_camera_close,
+ .read = pxa_camera_read,
+ .poll = pxa_camera_poll,
+ .ioctl = pxa_camera_ioctl,
+ .mmap = pxa_camera_mmap,
+ .llseek = no_llseek,
+ .write = pxa_camera_write,
+};
+
+static struct video_device vd = {
+ .owner = THIS_MODULE,
+ .name = "PXA camera",
+ .type = VID_TYPE_CAPTURE,
+/*
+ .hardware = VID_HARDWARE_PXA_CAMERA, /* FIXME */
+*/
+ .hardware = 0;
+ .fops = &vd_fops,
+ .minor = -1,
+};
+
+
+static irqreturn_t pxa_camera_irq(int irq, void *dev_id, struct pt_regs *regs)
+{
+ unsigned int cisr;
+
+ disable_irq(IRQ_CAMERA);
+ cisr = CISR;
+
+ if (cisr & CI_CISR_SOF)
+ CISR |= CI_CISR_SOF;
+
+ if (cisr & CI_CISR_EOF)
+ CISR |= CI_CISR_EOF;
+
+ enable_irq(IRQ_CAMERA);
+
+ return IRQ_HANDLED;
+}
+
+static int __init pxa_camera_init(void)
+{
+ if (request_irq(IRQ_CAMERA, pxa_camera_irq, 0, "PXA Camera", &vd)) {
+ dbg_print("Camera interrupt register failed failed number \n");
+ return -EIO;
+ }
+ dbg_print ("Camera interrupt register successful \n");
+
+ if(video_register_device(&vd, VFL_TYPE_GRABBER, 0) < 0)
+ {
+ dbg_print("PXA_CAMERA: video_register_device failed\n");
+ return -EIO;
+ }
+
+ dbg_print("PXA_CAMERA: video_register_device successfully. /dev/video%d \n", 0);
+
+ return 0;
+}
+
+static void __exit pxa_camera_exit(void)
+{
+ free_irq(IRQ_CAMERA, &vd);
+ video_unregister_device(&vd);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-09 03:12:47
|
Revision: 1028
http://svn.sourceforge.net/hackndev/?rev=1028&view=rev
Author: marex_z71
Date: 2007-06-08 20:12:45 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
PalmTC, PalmT5: correct machine names to be somehow "standard"
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5.c 2007-06-09 01:06:35 UTC (rev 1027)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5.c 2007-06-09 03:12:45 UTC (rev 1028)
@@ -430,7 +430,7 @@
-MACHINE_START(XSCALE_PALMTT5, "Palm T5")
+MACHINE_START(XSCALE_PALMTT5, "Palm Tungsten T5")
.phys_io = PALMT5_PHYS_IO_START,
.io_pg_offst = io_p2v(0x40000000),
.boot_params = 0xa0000100,
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-09 01:06:35 UTC (rev 1027)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-09 03:12:45 UTC (rev 1028)
@@ -162,7 +162,7 @@
}
-MACHINE_START(OMAP_PALMTC, "Palm TC")
+MACHINE_START(OMAP_PALMTC, "Palm Tungsten C")
/* Maintainer: P3T3, Petr Blaha <p3...@ce...> */
// .phys_ram = 0xa0000000,
.phys_io = 0x40000000,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-09 01:06:38
|
Revision: 1027
http://svn.sourceforge.net/hackndev/?rev=1027&view=rev
Author: marex_z71
Date: 2007-06-08 18:06:35 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
PalmLD: register gpio-keys
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-08 22:02:53 UTC (rev 1026)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-09 01:06:35 UTC (rev 1027)
@@ -351,8 +351,17 @@
};
static struct platform_device *devices[] __initdata = {
- &palmld_kbd, &palmld_ac97, &palmld_ide, &palmld_backlight,
- &palmldled_device, &palmldusb2_device, &palmld_pm, &bcm2035_bt,
+ &palmld_kbd,
+#ifdef CONFIG_KEYBOARD_GPIO
+ &palmld_pxa_keys,
+#endif
+ &palmld_ac97,
+ &palmld_ide,
+ &palmld_backlight,
+ &palmldled_device,
+ &palmldusb2_device,
+ &palmld_pm,
+ &bcm2035_bt,
};
/*********************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-08 22:02:55
|
Revision: 1026
http://svn.sourceforge.net/hackndev/?rev=1026&view=rev
Author: marex_z71
Date: 2007-06-08 15:02:53 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
PalmLD: I think we should resume on key F8
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-08 13:50:34 UTC (rev 1025)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-08 22:02:53 UTC (rev 1026)
@@ -312,7 +312,7 @@
********************************/
#ifdef CONFIG_KEYBOARD_GPIO
static struct gpio_keys_button palmld_pxa_buttons[] = {
- {KEY_F7, GPIO_NR_PALMLD_POWER_SWITCH, 0, "Power switch" },
+ {KEY_F8, GPIO_NR_PALMLD_POWER_SWITCH, 0, "Power switch" },
};
static struct gpio_keys_platform_data palmld_pxa_keys_data = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <med...@us...> - 2007-06-08 13:50:37
|
Revision: 1025
http://svn.sourceforge.net/hackndev/?rev=1025&view=rev
Author: medaglia
Date: 2007-06-08 06:50:34 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Added defconfig for palmte2 and some minor cleanings.
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmte2_defconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
Modified: linux4palm/linux/trunk/arch/arm/configs/palmte2_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmte2_defconfig 2007-06-06 22:01:45 UTC (rev 1024)
+++ linux4palm/linux/trunk/arch/arm/configs/palmte2_defconfig 2007-06-08 13:50:34 UTC (rev 1025)
@@ -1,13 +1,27 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-hnd0
-# Wed May 10 01:16:02 2006
+# Linux kernel version: 2.6.21-hnd1
+# Fri Jun 8 23:44:41 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
@@ -23,18 +37,28 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_SYSCTL is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
-# CONFIG_MINIMAL_OOPS is not set
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="/home/palm/initrd/initramfs"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_EMBEDDED=y
-# CONFIG_KALLSYMS is not set
-# CONFIG_HOTPLUG is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
@@ -42,13 +66,9 @@
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
-CONFIG_USELIB=y
-CONFIG_CORE_DUMP=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
@@ -61,33 +81,50 @@
#
# Block layer
#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_AS is not set
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_IOSCHED="cfq"
#
# System Type
#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS7500 is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
@@ -95,49 +132,61 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
#
# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
# CONFIG_MACH_MAINSTONE is not set
# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
# CONFIG_ARCH_ESERIES is not set
# CONFIG_MACH_A620 is not set
# CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
# CONFIG_ARCH_H1900 is not set
# CONFIG_ARCH_H2200 is not set
-# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H3900 is not set
# CONFIG_MACH_H4000 is not set
# CONFIG_MACH_H4700 is not set
# CONFIG_MACH_HX2750 is not set
# CONFIG_ARCH_H5400 is not set
# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
+# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
-# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_MACH_X50 is not set
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_XSCALE_PALMTREO650 is not set
+# CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
CONFIG_MACH_TUNGE2=y
-CONFIG_PALMTE2_BUTTONS=y
-CONFIG_PALMTE2_AC97=y
+# CONFIG_PALMTE2_BUTTONS is not set
+# CONFIG_PALMTE2_AC97 is not set
# CONFIG_GPIOD is not set
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_XSCALE_PALMTT5 is not set
# CONFIG_MACH_XSCALE_PALMTX is not set
# CONFIG_MACH_PALMZ72 is not set
# CONFIG_MACH_OMAP_PALMTC is not set
+# CONFIG_MACH_ZIRE31 is not set
+# CONFIG_GPIOED is not set
+# CONFIG_GPIOEDNG is not set
# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
#
# Linux As Bootloader
@@ -153,27 +202,20 @@
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
#
# Processor Features
#
CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
+# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
#
-# Compaq/iPAQ Platforms
-#
-
-#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-# CONFIG_IPAQ_HAMCOP is not set
-
-#
# Bus support
#
@@ -186,8 +228,10 @@
# Kernel Features
#
# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
-# CONFIG_AEABI is not set
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -197,15 +241,19 @@
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
# Boot options
#
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="mem=16m root=/dev/mmcblk0p2 init=/sbin/init rw rootfstype=ext2"
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -229,13 +277,11 @@
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
#
# Power management options
#
# CONFIG_PM is not set
-# CONFIG_APM is not set
#
# Networking
@@ -247,8 +293,12 @@
#
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
+CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -262,12 +312,21 @@
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set
#
@@ -293,7 +352,6 @@
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
@@ -307,49 +365,7 @@
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-# CONFIG_IRLAN is not set
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
+# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
@@ -363,6 +379,7 @@
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
@@ -382,15 +399,19 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -404,8 +425,14 @@
#
# CONFIG_RAID_ATTRS is not set
# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
@@ -427,31 +454,6 @@
# Network device support
#
# CONFIG_NETDEVICES is not set
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
-# CONFIG_NET_ETHERNET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -464,11 +466,15 @@
# Input device support
#
CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
#
-# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_TSDEV=y
CONFIG_INPUT_TSDEV_SCREEN_X=320
@@ -479,13 +485,7 @@
#
# Input Device Drivers
#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_PALMIR=y
+# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -493,7 +493,16 @@
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+CONFIG_TOUCHSCREEN_WM9712=y
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
# CONFIG_INPUT_MISC is not set
#
@@ -508,6 +517,7 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -518,31 +528,12 @@
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_PXA_COUNT=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_PXA is not set
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-
-#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set
@@ -551,23 +542,25 @@
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
# CONFIG_NVRAM is not set
# CONFIG_SA1100_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
+# CONFIG_TIHTC is not set
# CONFIG_RAW_DRIVER is not set
#
# TPM devices
#
# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
# SPI support
#
# CONFIG_SPI is not set
@@ -585,28 +578,53 @@
# CONFIG_HWMON_VID is not set
#
-# SoC drivers
+# Hardware Monitoring - external power and batteries
#
+# CONFIG_EXTERNAL_POWER is not set
+# CONFIG_BATTERY is not set
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+
+#
+# Misc devices
+#
+# CONFIG_BATTCHARGE_MONITOR is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_ADC is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
# CONFIG_SOC_MQ11XX is not set
# CONFIG_SOC_T7L66XB is not set
# CONFIG_SOC_TC6387XB is not set
# CONFIG_SOC_TC6393XB is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
# CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
#
-# Misc devices
+# LED devices
#
-CONFIG_BATTERY_MONITOR=y
+# CONFIG_NEW_LEDS is not set
#
-# Multimedia Capabilities Port drivers
+# LED drivers
#
-# CONFIG_MCP is not set
#
-# Multimedia Capabilities Port drivers
+# LED Triggers
#
#
@@ -622,18 +640,33 @@
#
# Graphics support
#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=y
CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VSFB is not set
#
# Console display driver support
@@ -653,7 +686,6 @@
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Sound
@@ -667,11 +699,11 @@
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
@@ -679,7 +711,6 @@
# Generic devices
#
CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_AC97_BUS=y
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
@@ -688,19 +719,32 @@
#
# ALSA ARM devices
#
+CONFIG_SND_PXA2xx_I2SOUND=y
CONFIG_SND_PXA2XX_PCM=y
CONFIG_SND_PXA2XX_AC97=y
#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
#
+# HID Devices
+#
+# CONFIG_HID is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB is not set
#
@@ -719,15 +763,15 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
-# CONFIG_MMC_WBSD_PALMT3 is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
-# CONFIG_MMC_ASIC3 is not set
#
-# LED devices
+# Real Time Clock
#
-# CONFIG_CLASS_LEDS is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_EPOCH=1970
#
# File systems
@@ -736,16 +780,19 @@
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
-# CONFIG_INOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
-# CONFIG_DNOTIFY is not set
+CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set
@@ -759,19 +806,23 @@
#
# DOS/FAT/NT Filesystems
#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
# CONFIG_CONFIGFS_FS is not set
#
@@ -786,6 +837,7 @@
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
+# CONFIG_SQUASHFS_LZMA is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -816,7 +868,7 @@
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
+CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
@@ -840,7 +892,7 @@
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
@@ -856,6 +908,11 @@
# CONFIG_NLS_UTF8 is not set
#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
# Profiling support
#
# CONFIG_PROFILING is not set
@@ -864,10 +921,15 @@
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_SMALLOOPS is not set
# CONFIG_DEBUG_KERNEL is not set
CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_FRAME_POINTER=y
# CONFIG_DEBUG_USER is not set
@@ -883,13 +945,13 @@
# CONFIG_CRYPTO is not set
#
-# Hardware crypto devices
-#
-
-#
# Library routines
#
-CONFIG_CRC_CCITT=y
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/Kconfig 2007-06-06 22:01:45 UTC (rev 1024)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/Kconfig 2007-06-08 13:50:34 UTC (rev 1025)
@@ -3,30 +3,3 @@
select PXA25x
help
This enables support for Palm Tungsten E2 handheld.
-
-config PALMTE2_BUTTONS
- tristate "Palm Tungsten E2 buttons driver"
- depends on MACH_TUNGE2
- default y
- help
- This driver translates button presses on a Palm
- Tungsten E2 to Linux input subsystem events.
-
-config PALMTE2_AC97
- tristate "Palm Tungsten E2 AC97"
- depends on MACH_TUNGE2
- default y
- help
- This driver handles the WM9712L AC97 codec,
- which is used to support the touchscreen
- and battery level monitor.
-
-config GPIOD
- tristate "GPIOD"
- depends on MACH_TUNGE2
- default n
- help
- GPIOD
- This is used only for debugging and development.
-
- If unsure, choose N.
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-06 22:01:45 UTC (rev 1024)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-08 13:50:34 UTC (rev 1025)
@@ -25,7 +25,6 @@
#include <asm/arch/pxa-dmabounce.h>
#include <asm/arch/pxafb.h>
#include <asm/arch/pxa-regs.h>
-//#include <asm/arch/pxa_keys.h>
#include <asm/arch/udc.h>
#include <asm/arch/irda.h>
#include <asm/arch/mmc.h>
@@ -39,7 +38,6 @@
#include <sound/ac97_codec.h>
#include "../generic.h"
-//#include "../drivers/serial/pxa-serial.h"
#define DEBUG
@@ -230,7 +228,7 @@
}
MACHINE_START(TUNGE2, "Palm Tungsten E2")
- /* Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...> */
+ Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...>
//.phys_ram = 0xa0000000,
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-06 22:01:47
|
Revision: 1024
http://svn.sourceforge.net/hackndev/?rev=1024&view=rev
Author: marex_z71
Date: 2007-06-06 15:01:45 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
PalmTX: New defconfig (from |miska|, thanks)
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig
Modified: linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-06-06 20:53:13 UTC (rev 1023)
+++ linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-06-06 22:01:45 UTC (rev 1024)
@@ -1,11 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-hnd0
-# Wed Mar 28 10:35:44 2007
+# Linux kernel version: 2.6.21-hnd1
+# Wed Jun 6 22:55:59 2007
#
CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -35,6 +39,7 @@
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -44,6 +49,7 @@
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -122,6 +128,7 @@
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
@@ -130,6 +137,8 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -158,6 +167,7 @@
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
@@ -171,7 +181,6 @@
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_XSCALE_PALMTT5 is not set
CONFIG_MACH_XSCALE_PALMTX=y
-# CONFIG_PALMTX_PCMCIA is not set
# CONFIG_PALMTX_DEBUG is not set
CONFIG_PALMTX_BATTERY=m
CONFIG_PALMTX_PM=y
@@ -206,20 +215,12 @@
#
CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
CONFIG_IWMMXT=y
# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-
-#
# Bus support
#
@@ -246,6 +247,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -255,6 +257,8 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=32M"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -287,7 +291,7 @@
# CONFIG_PM_DEBUG is not set
# CONFIG_DPM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=y
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -304,6 +308,7 @@
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -423,16 +428,13 @@
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_SCO is not set
-
#
# Bluetooth device drivers
#
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_BCSP is not set
CONFIG_BT_BCM2035UART=m
-# CONFIG_BT_HCIUART_BCSP is not set
# CONFIG_BT_HCIVHCI is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
@@ -472,6 +474,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -484,7 +487,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -615,9 +617,10 @@
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_GPIO_KEYS is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
-# CONFIG_KEYBOARD_PALMWK is not set
+# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -629,9 +632,8 @@
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
CONFIG_TOUCHSCREEN_WM97XX=y
# CONFIG_TOUCHSCREEN_WM9705 is not set
CONFIG_TOUCHSCREEN_WM9712=y
@@ -671,6 +673,7 @@
# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
@@ -689,6 +692,7 @@
CONFIG_SA1100_RTC=m
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
# CONFIG_RAW_DRIVER is not set
#
@@ -716,6 +720,7 @@
#
# SPI Protocol Masters
#
+# CONFIG_SPI_AT25 is not set
#
# Dallas's 1-wire bus
@@ -729,10 +734,12 @@
# CONFIG_HWMON_VID is not set
#
-# Hardware Monitoring - Battery
+# Hardware Monitoring - external power and batteries
#
-CONFIG_BATTERY_MONITOR=y
-# CONFIG_ADC_BATTERY is not set
+CONFIG_EXTERNAL_POWER=y
+CONFIG_BATTERY=y
+# CONFIG_PDA_POWER is not set
+CONFIG_APM_POWER=y
#
# L3 serial bus support
@@ -740,20 +747,6 @@
# CONFIG_L3 is not set
#
-# SoC drivers
-#
-# CONFIG_SOC_MQ11XX is not set
-# CONFIG_SOC_T7L66XB is not set
-# CONFIG_SOC_TC6387XB is not set
-# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
-# CONFIG_SOC_TSC2200 is not set
-
-#
# Misc devices
#
# CONFIG_BATTCHARGE_MONITOR is not set
@@ -761,12 +754,25 @@
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
-# CONFIG_ADC_AD7877 is not set
-# CONFIG_TIFM_CORE is not set
+# CONFIG_ADC is not set
#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
+
+#
# LED devices
#
CONFIG_NEW_LEDS=y
@@ -803,9 +809,7 @@
#
CONFIG_VIDEO_ADV_DEBUG=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_CPIA is not set
-# CONFIG_PXA_CAMERA is not set
#
# Radio Adapters
@@ -819,15 +823,26 @@
#
# Graphics support
#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=y
+CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
-CONFIG_FB=y
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
@@ -862,12 +877,6 @@
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=y
#
# Sound
@@ -922,6 +931,7 @@
# HID Devices
#
CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
# USB support
@@ -946,6 +956,7 @@
CONFIG_USB_GADGET_PXA27X=y
CONFIG_USB_PXA27X=y
# CONFIG_USB_PXA27X_DMA is not set
+# CONFIG_USB_GADGET_SX2 is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_MQ11XX is not set
# CONFIG_USB_GADGET_LH7A40X is not set
@@ -962,6 +973,7 @@
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
+# CONFIG_USB_PXA2XX_GPIO is not set
#
# MMC/SD Card support
@@ -970,7 +982,6 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
@@ -978,8 +989,11 @@
# Real Time Clock
#
CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=m
-CONFIG_RTC_EPOCH=1970
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_EPOCH=1904
+# CONFIG_RTC_DEBUG is not set
#
# RTC interfaces
@@ -992,6 +1006,7 @@
#
# RTC drivers
#
+# CONFIG_RTC_DRV_CMOS is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1197,8 +1212,10 @@
# CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
@@ -1212,6 +1229,7 @@
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
#
@@ -1228,4 +1246,5 @@
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-06 20:53:24
|
Revision: 1023
http://svn.sourceforge.net/hackndev/?rev=1023&view=rev
Author: marex_z71
Date: 2007-06-06 13:53:13 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
l4p: reverting Makefile from r1022 ...
Modified Paths:
--------------
linux4palm/linux/trunk/Makefile
Modified: linux4palm/linux/trunk/Makefile
===================================================================
--- linux4palm/linux/trunk/Makefile 2007-06-06 02:47:21 UTC (rev 1022)
+++ linux4palm/linux/trunk/Makefile 2007-06-06 20:53:13 UTC (rev 1023)
@@ -183,7 +183,7 @@
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH := arm
-CROSS_COMPILE ?= arm-none-eabi-
+CROSS_COMPILE ?= arm-softfloat-linux-gnu-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <med...@us...> - 2007-06-06 02:47:23
|
Revision: 1022
http://svn.sourceforge.net/hackndev/?rev=1022&view=rev
Author: medaglia
Date: 2007-06-05 19:47:21 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
Small fixes to have this kernel building for Palm T|E2.
Modified Paths:
--------------
linux4palm/linux/trunk/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2_ac97.c
Modified: linux4palm/linux/trunk/Makefile
===================================================================
--- linux4palm/linux/trunk/Makefile 2007-06-03 10:06:21 UTC (rev 1021)
+++ linux4palm/linux/trunk/Makefile 2007-06-06 02:47:21 UTC (rev 1022)
@@ -183,7 +183,7 @@
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH := arm
-CROSS_COMPILE ?= arm-softfloat-linux-gnu-
+CROSS_COMPILE ?= arm-none-eabi-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-03 10:06:21 UTC (rev 1021)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-06 02:47:21 UTC (rev 1022)
@@ -39,14 +39,14 @@
#include <sound/ac97_codec.h>
#include "../generic.h"
-#include "../drivers/serial/pxa-serial.h"
+//#include "../drivers/serial/pxa-serial.h"
#define DEBUG
/**
* IRDA
*/
-
+#if 0
static void
palmte2_irda_configure (struct uart_pxa_port *up, int enable)
{
@@ -114,6 +114,8 @@
.get_txrx = palmte2_irda_get_txrx,
};
+#endif
+
struct platform_device palmte2_buttons = {
.name = "palmte2-buttons",
.id = -1,
@@ -184,8 +186,8 @@
}
}
-
-static struct pxafb_mach_info palmte2lcd __initdata = {
+static struct pxafb_mode_info palmte2_lcd_modes[] = {
+{
.pixclock = 0,
.xres = 320,
.yres = 320,
@@ -199,6 +201,14 @@
.lower_margin = 5,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+// .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+},
+};
+
+static struct pxafb_mach_info palmte2_lcd_screen = {
+ .modes = palmte2_lcd_modes,
+ .num_modes = ARRAY_SIZE(palmte2_lcd_modes),
+
.lccr0 = 0x000000F9,
.lccr3 = 0x04700006,
.pxafb_backlight_power = palm_backlight_power,
@@ -208,9 +218,9 @@
{
GCR &= ~GCR_PRIRDY_IEN;
- set_pxa_fb_info(&palmte2lcd);
+ set_pxa_fb_info(&palmte2_lcd_screen);
- stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs;
+// stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs;
platform_add_devices(devices, ARRAY_SIZE(devices));
/*
@@ -221,7 +231,7 @@
MACHINE_START(TUNGE2, "Palm Tungsten E2")
/* Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...> */
- .phys_ram = 0xa0000000,
+ //.phys_ram = 0xa0000000,
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = pxa_map_io,
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2_ac97.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2_ac97.c 2007-06-03 10:06:21 UTC (rev 1021)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2_ac97.c 2007-06-06 02:47:21 UTC (rev 1022)
@@ -21,7 +21,8 @@
#include <asm/arch/pxa-regs.h>
#include <asm/arch/irqs.h>
/* XXX: Should be changed! */
-#include <asm/arch-pxa/palmld-ac97.h>
+//#include <asm/arch-pxa/palmld-ac97.h>
+#include <linux/wm97xx.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z7...@us...> - 2007-06-03 10:06:26
|
Revision: 1021
http://svn.sourceforge.net/hackndev/?rev=1021&view=rev
Author: z72ka
Date: 2007-06-03 03:06:21 -0700 (Sun, 03 Jun 2007)
Log Message:
-----------
BCM2035: Fixed compilation warnings
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/bluetooth/bcm2035_uart.c
Modified: linux4palm/linux/trunk/drivers/bluetooth/bcm2035_uart.c
===================================================================
--- linux4palm/linux/trunk/drivers/bluetooth/bcm2035_uart.c 2007-06-03 00:56:02 UTC (rev 1020)
+++ linux4palm/linux/trunk/drivers/bluetooth/bcm2035_uart.c 2007-06-03 10:06:21 UTC (rev 1021)
@@ -29,6 +29,9 @@
//#define BCM2035_DEBUG
+extern void bcm2035_bt_power(int on);
+extern void bcm2035_bt_reset(int on);
+
struct bcm2035_bt_funcs {
void (*configure) ( int state );
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-03 00:56:04
|
Revision: 1020
http://svn.sourceforge.net/hackndev/?rev=1020&view=rev
Author: marex_z71
Date: 2007-06-02 17:56:02 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
PalmLD: add missing include
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-02 20:54:23 UTC (rev 1019)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-03 00:56:02 UTC (rev 1020)
@@ -15,6 +15,7 @@
#include <linux/input.h>
#include <linux/delay.h>
#include <linux/irq.h>
+#include <linux/gpio_keys.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-06-02 20:54:30
|
Revision: 1019
http://svn.sourceforge.net/hackndev/?rev=1019&view=rev
Author: keddar
Date: 2007-06-02 13:54:23 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
TT3: fixed speed problem...
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c
Modified: linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c
===================================================================
--- linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c 2007-06-02 16:03:07 UTC (rev 1018)
+++ linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c 2007-06-02 20:54:23 UTC (rev 1019)
@@ -1369,9 +1369,11 @@
mmc->max_hw_segs = MAX_HW_SEGMENTS;
mmc->max_phys_segs = MAX_PHYS_SEGMENTS;
-/* mmc->max_sectors = SAFE_MAX_SECTORS;
- mmc->max_seg_size = MAX_SEGMENT_SIZE;
-*/
+ mmc->max_blk_count = 4095;
+ mmc->max_blk_size = 1024;
+ mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
+ mmc->max_seg_size = mmc->max_req_size;
+
dev_set_drvdata(dev, mmc);
init_timer(&host->delayed_timer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-06-02 16:03:10
|
Revision: 1018
http://svn.sourceforge.net/hackndev/?rev=1018&view=rev
Author: marex_z71
Date: 2007-06-02 09:03:07 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
PalmLD: GPIO Keys stuff
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-02 12:02:54 UTC (rev 1017)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-06-02 16:03:07 UTC (rev 1018)
@@ -306,7 +306,27 @@
},
};
+/********************************
+ * GPIO Key - Voice Memo Button *
+ ********************************/
+#ifdef CONFIG_KEYBOARD_GPIO
+static struct gpio_keys_button palmld_pxa_buttons[] = {
+ {KEY_F7, GPIO_NR_PALMLD_POWER_SWITCH, 0, "Power switch" },
+};
+static struct gpio_keys_platform_data palmld_pxa_keys_data = {
+ .buttons = palmld_pxa_buttons,
+ .nbuttons = ARRAY_SIZE(palmld_pxa_buttons),
+};
+
+static struct platform_device palmld_pxa_keys = {
+ .name = "gpio-keys",
+ .dev = {
+ .platform_data = &palmld_pxa_keys_data,
+ },
+};
+#endif
+
/********************
* Power Management *
********************/
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-06-02 12:02:54 UTC (rev 1017)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-06-02 16:03:07 UTC (rev 1018)
@@ -24,7 +24,7 @@
#define GPIO_NR_PALMLD_GPIO_RESET 1
#define GPIO_NR_PALMLD_POWER_DETECT 4
#define GPIO_NR_PALMLD_HOTSYNC_BUTTON_N 10
-#define GPIO_NR_PALMLD_POWER_SWITCH 11
+#define GPIO_NR_PALMLD_POWER_SWITCH 12
#define GPIO_NR_PALMLD_EARPHONE_DETECT 13
#define GPIO_NR_PALMLD_SD_DETECT_N 14 /* SD card inserted; RE FE; Input */
#define GPIO_NR_PALMLD_LOCK_SWITCH 15 /* keypad lock */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z7...@us...> - 2007-06-02 12:02:58
|
Revision: 1017
http://svn.sourceforge.net/hackndev/?rev=1017&view=rev
Author: z72ka
Date: 2007-06-02 05:02:54 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Palm Z72: Migrating to new GPIO keyboard driver, works very well, no problem in suspend like old driver
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-05-31 23:17:48 UTC (rev 1016)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-06-02 12:02:54 UTC (rev 1017)
@@ -188,7 +188,7 @@
/********************************
* GPIO Key - Voice Memo Button *
********************************/
-#ifdef CONFIG_GPIO_KEYS
+#ifdef CONFIG_KEYBOARD_GPIO
static struct gpio_keys_button palmz72_pxa_buttons[] = {
{KEY_F7, GPIO_NR_PALMZ72_KP_DKIN7, 0, "Voice Memo Button" },
};
@@ -406,7 +406,7 @@
&palmz72_pm,
&palmz72_backlight,
&palmz72_keypad,
-#ifdef CONFIG_GPIO_KEYS
+#ifdef CONFIG_KEYBOARD_GPIO
&palmz72_pxa_keys,
#endif
&palmz72_led_device,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-05-31 23:17:51
|
Revision: 1016
http://svn.sourceforge.net/hackndev/?rev=1016&view=rev
Author: marex_z71
Date: 2007-05-31 16:17:48 -0700 (Thu, 31 May 2007)
Log Message:
-----------
Cocoboot: Fix booting on PalmT3 ... finally ... burn in hell bloody fscking bfugarux :D ... YEAH! ... One Cocoboot to rule then
all!
Modified Paths:
--------------
cocoboot/trunk/arm/boot.c
Modified: cocoboot/trunk/arm/boot.c
===================================================================
--- cocoboot/trunk/arm/boot.c 2007-05-30 14:39:41 UTC (rev 1015)
+++ cocoboot/trunk/arm/boot.c 2007-05-31 23:17:48 UTC (rev 1016)
@@ -21,16 +21,20 @@
#include "regs.h"
#include "cpu.h"
+#define MACH_TYPE_T3XSCALE 829
+
#ifdef TREO650
-#define KERNEL_OFFSET 0x0800000
-#define TAG_OFFSET 0x100
-#define INITRD_OFFSET 0x1500000
+#define KERNEL_OFFSET 0x0800000
+#define TAG_OFFSET 0x100
+#define INITRD_OFFSET 0x1500000
#else
-#define KERNEL_OFFSET 0x8000
-#define TAG_OFFSET 0x100
-#define INITRD_OFFSET 0x0400000
+#define KERNEL_OFFSET 0x8000
+#define TAG_OFFSET 0x100
+#define INITRD_OFFSET 0x0400000
#endif
+#define T3_KERNEL_OFFSET 0x0800000
+#define T3_INITRD_OFFSET 0x1500000
static void jump_to_kernel(UInt32 kernel_base, UInt32 tag_base, UInt32 mach)
{
@@ -88,6 +92,8 @@
if(!kernel || !cmdline) {
return 0xc0ffee;
}
+ UInt32 kernel_offset;
+ UInt32 initrd_offset;
/* since we're going to turn off the MMU, we need to translate
* all out pointers to physical addresses.
@@ -191,20 +197,28 @@
}
#endif
+ if (pg->mach_num==MACH_TYPE_T3XSCALE){
+ kernel_offset=T3_KERNEL_OFFSET;
+ initrd_offset=T3_INITRD_OFFSET;
+ } else {
+ kernel_offset=KERNEL_OFFSET;
+ initrd_offset=INITRD_OFFSET;
+ }
+
/* place kernel parameters in memory */
setup_atags(pg->ram_base + TAG_OFFSET, pg->ram_base, pg->ram_size, cmdline,
- pg->ram_base + INITRD_OFFSET, initrd_size);
+ pg->ram_base + initrd_offset, initrd_size);
/* copy kernel into place */
- copy_image((void*)(pg->ram_base + KERNEL_OFFSET), kernel, kernel_size);
+ copy_image((void*)(pg->ram_base + kernel_offset), kernel, kernel_size);
/* copy initrd into place */
if (initrd) {
- copy_image((void*)(pg->ram_base + INITRD_OFFSET), initrd, initrd_size);
+ copy_image((void*)(pg->ram_base + initrd_offset), initrd, initrd_size);
}
/* bring on the penguin! */
- jump_to_kernel(pg->ram_base + KERNEL_OFFSET, pg->ram_base + TAG_OFFSET, pg->mach_num);
+ jump_to_kernel(pg->ram_base + kernel_offset, pg->ram_base + TAG_OFFSET, pg->mach_num);
return 0xe4; /* sadly, this return will never be executed */
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-05-30 14:39:43
|
Revision: 1015
http://svn.sourceforge.net/hackndev/?rev=1015&view=rev
Author: farcaller
Date: 2007-05-30 07:39:41 -0700 (Wed, 30 May 2007)
Log Message:
-----------
hexterm: Initial import
Added Paths:
-----------
linux4palm/tools/hexterm/
linux4palm/tools/hexterm/Makefile
linux4palm/tools/hexterm/hexterm.c
Added: linux4palm/tools/hexterm/Makefile
===================================================================
--- linux4palm/tools/hexterm/Makefile (rev 0)
+++ linux4palm/tools/hexterm/Makefile 2007-05-30 14:39:41 UTC (rev 1015)
@@ -0,0 +1,7 @@
+all: hexterm
+
+hexterm: hexterm.c
+ $(CC) -g -std=c99 -o hexterm hexterm.c -lreadline
+
+clean:
+ rm -f hexterm *.o
Added: linux4palm/tools/hexterm/hexterm.c
===================================================================
--- linux4palm/tools/hexterm/hexterm.c (rev 0)
+++ linux4palm/tools/hexterm/hexterm.c 2007-05-30 14:39:41 UTC (rev 1015)
@@ -0,0 +1,221 @@
+/*******************************************************************************
+ *
+ * hexterm - stupid hex i/o terminal
+ *
+ * (C) 2007 by Vladimir "Farcaller" Pouzanov <far...@gm...>
+ * Parts of code from bcm-tool by Daniel Ribeiro
+ *
+ * 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
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ ******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <termios.h>
+#include <unistd.h>
+#include <errno.h>
+
+#define MAX_REQUEST 1024
+#define TRUE 1
+#define FALSE 0
+
+/*** parser and console i/o ***/
+
+char parse_char(const char *c)
+{
+ long int i;
+ if(strlen(c)>2)
+ return 0;
+ i = strtol(c, NULL, 16);
+ if(i>255)
+ return 0;
+ return i;
+}
+
+char * parse_line(char *line, int *len)
+{
+ char *p, *s;
+ char b[4];
+ char *buff, *bp;
+ char byte;
+ int done = FALSE;
+ int cnt = 0;
+
+ s = p = line;
+ buff = malloc(MAX_REQUEST);
+ bp = buff;
+ while (*p != '\0' && !done) {
+ while (*p != '\0' && *p != ' ')
+ p++;
+ if (*p == '\0') {
+ done = TRUE;
+ } else {
+ *p = '\0';
+ p++;
+ }
+ strncpy(b, s, 3);
+ b[3] = '\0';
+ byte = parse_char(b);
+ *bp = byte;
+ bp++;
+ cnt++;
+ s = p;
+ }
+ *len = cnt;
+ return buff;
+}
+
+/*** serial i/o ***/
+
+int set_baud(int fd, int baud)
+{
+ struct termios t;
+ char buf[8];
+
+ printf("< set baud: %d\n", baud);
+ tcgetattr(fd, &t);
+ switch (baud) {
+ case 115200:
+ //send_cmd(fd, CMD_SET_BAUD, BAUD115200, 2);
+ cfsetospeed(&t, B115200);
+ break;
+ case 460800:
+ //send_cmd(fd, CMD_SET_BAUD, BAUD460800, 2);
+ cfsetospeed(&t, B460800);
+ break;
+ case 921600:
+ //send_cmd(fd, CMD_SET_BAUD, BAUD921600, 2);
+ cfsetospeed(&t, B921600);
+ break;
+ default:
+ printf ("invalid baud rate!\n");
+ return(-1);
+ }
+ return tcsetattr(fd, TCSANOW, &t);
+}
+
+
+void send_data(int fd, char *bytes, int len)
+{
+ if (len == 0) {
+ printf("==> ...\n");
+ return;
+ }
+ printf("==[%d][", len);
+ char *p;
+ int i;
+ ssize_t sz;
+ sz = write(fd, bytes, len);
+ if (sz == -1) {
+ fprintf(stderr, "write() failed: %d\n", errno);
+ exit(10);
+ }
+ printf("%d]=> ", sz);
+ for(p=bytes, i=0;i<len;i++,p++)
+ printf("%02hhX ", *p);
+ printf("\n");
+
+}
+
+void recv_and_print(int fd)
+{
+ ssize_t sz=0;
+ int cnt = 0;
+ char buf;
+ printf("<== ");
+ while (sz != -1) {
+ sz = read(fd, &buf, 1);
+ if (sz == -1) {
+ if (errno == EAGAIN) {
+ //printf("[%u]==\n", cnt);
+ break;
+ } else {
+ printf("?? %d\n", errno);
+ }
+ return;
+ } else {
+ printf("%02hhX ", buf);
+ cnt++;
+ }
+ }
+
+ printf("[%u]==\n", cnt);
+}
+
+/*** main code ***/
+
+void main_loop(int fd)
+{
+ char *rl = 0;
+ char *bytes;
+ int len;
+ while (TRUE) {
+ rl = readline("> ");
+ if (rl == 0) {
+ return;
+ }
+ add_history(rl);
+ if (strncmp(rl, "baud ", 5) == 0) {
+ long int l;
+ char *p = rl+5;
+ l = atoi(p);
+ set_baud(fd, l);
+ free(rl);
+ rl = 0;
+ continue;
+ }
+ bytes = parse_line(rl, &len);
+ free(rl);
+ rl = 0;
+ send_data(fd, bytes, len);
+ free(bytes);
+ recv_and_print(fd);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ int fd;
+ struct termios term;
+ if (argc != 2) {
+ fprintf(stderr, "Usage: %s device\n", argv[0]);
+ return 2;
+ }
+ fd = open(argv[1], O_RDWR | O_NOCTTY | O_NONBLOCK);
+ if(fd < 0) {
+ fprintf(stderr, "can't open %s\n", argv[1]);
+ return 1;
+ }
+ printf("< opened %s\n", argv[1]);
+
+ term.c_iflag=0x5;
+ term.c_oflag=0;
+ term.c_cflag=0x1cb2;
+ term.c_lflag=0;
+ term.c_line=0;
+ memcpy(term.c_cc, "\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", NCCS);
+ ioctl (fd, TCSETS, &term);
+ printf("< configured port\n");
+ main_loop(fd);
+ close(fd);
+ return 0;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-05-29 22:21:21
|
Revision: 1014
http://svn.sourceforge.net/hackndev/?rev=1014&view=rev
Author: keddar
Date: 2007-05-29 15:21:13 -0700 (Tue, 29 May 2007)
Log Message:
-----------
BFUGarux: fix calculate initrd base address
Modified Paths:
--------------
linux4palm/BFUGarux/garux.h.sh
Modified: linux4palm/BFUGarux/garux.h.sh
===================================================================
--- linux4palm/BFUGarux/garux.h.sh 2007-05-29 18:05:43 UTC (rev 1013)
+++ linux4palm/BFUGarux/garux.h.sh 2007-05-29 22:21:13 UTC (rev 1014)
@@ -41,8 +41,7 @@
echo -n `cat mach.h | grep PHYSICAL_RAM_SIZE | cut -f3 -d\ ` >> garux.h #rcp
if [ "$INITRD" != "" ]; then
echo -n " initrd=" >> garux.h #rcp
- INITRD_BASE_ADDRESS=`echo $RAM_BASE_ADDRESS | cut -f2 -dx`
- base_val=`echo $(($INITRD_BASE_ADDRESS+0400000))`
+ base_val=`echo $(($RAM_BASE_ADDRESS+0x400000))`
INITRD_BASE_ADDRESS=`printf "0x%X" $base_val`
echo -n $INITRD_BASE_ADDRESS >> garux.h #rcp
echo -n ",$NUM_INITRD" >> garux.h #rcp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z7...@us...> - 2007-05-29 12:59:45
|
Revision: 1012
http://svn.sourceforge.net/hackndev/?rev=1012&view=rev
Author: z72ka
Date: 2007-05-29 05:59:19 -0700 (Tue, 29 May 2007)
Log Message:
-----------
Palm Z72: Defconfig compatible with 2.6.21 + added bluetooth stuff and modules for PPP
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
Modified: linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig 2007-05-28 19:47:23 UTC (rev 1011)
+++ linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig 2007-05-29 12:59:19 UTC (rev 1012)
@@ -1,11 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-hnd0
-# Sun Mar 18 20:44:25 2007
+# Linux kernel version: 2.6.21-hnd0
+# Tue May 29 14:46:06 2007
#
CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -35,6 +39,7 @@
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -44,6 +49,7 @@
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -122,6 +128,7 @@
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
@@ -130,6 +137,8 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -158,6 +167,7 @@
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
@@ -204,20 +214,12 @@
#
CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
CONFIG_IWMMXT=y
# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-
-#
# Bus support
#
@@ -244,6 +246,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -253,6 +256,8 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=32M"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -285,7 +290,7 @@
# CONFIG_PM_DEBUG is not set
# CONFIG_DPM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=y
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -302,6 +307,7 @@
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -411,17 +417,24 @@
# FIR device drivers
#
CONFIG_PXA_FICP=y
-CONFIG_BT=m
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_SCO is not set
+CONFIG_BT=y
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
CONFIG_BT_HCIUART=m
-# CONFIG_BT_HCIUART_H4 is not set
-# CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_BCM2035UART=m
+CONFIG_BT_HCIVHCI=m
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
@@ -439,7 +452,7 @@
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
# CONFIG_SYS_HYPERVISOR is not set
#
@@ -460,6 +473,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -472,7 +486,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -557,16 +570,16 @@
# CONFIG_WAN is not set
CONFIG_PPP=y
# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
# CONFIG_SLIP is not set
CONFIG_SLHC=y
-# CONFIG_SHAPER is not set
+CONFIG_SHAPER=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -603,8 +616,10 @@
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_GPIO_KEYS is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
+# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -616,9 +631,8 @@
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
CONFIG_TOUCHSCREEN_WM97XX=y
# CONFIG_TOUCHSCREEN_WM9705 is not set
CONFIG_TOUCHSCREEN_WM9712=y
@@ -658,6 +672,7 @@
# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
@@ -676,6 +691,7 @@
CONFIG_SA1100_RTC=m
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
# CONFIG_RAW_DRIVER is not set
#
@@ -697,12 +713,13 @@
#
# SPI Master Controller Drivers
#
-# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_BITBANG=m
CONFIG_SPI_PXA2XX=y
#
# SPI Protocol Masters
#
+# CONFIG_SPI_AT25 is not set
#
# Dallas's 1-wire bus
@@ -716,10 +733,12 @@
# CONFIG_HWMON_VID is not set
#
-# Hardware Monitoring - Battery
+# Hardware Monitoring - external power and batteries
#
-CONFIG_BATTERY_MONITOR=y
-# CONFIG_ADC_BATTERY is not set
+CONFIG_EXTERNAL_POWER=m
+CONFIG_BATTERY=m
+CONFIG_PDA_POWER=m
+CONFIG_APM_POWER=m
#
# L3 serial bus support
@@ -727,20 +746,6 @@
# CONFIG_L3 is not set
#
-# SoC drivers
-#
-# CONFIG_SOC_MQ11XX is not set
-# CONFIG_SOC_T7L66XB is not set
-# CONFIG_SOC_TC6387XB is not set
-# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
-# CONFIG_SOC_TSC2200 is not set
-
-#
# Misc devices
#
# CONFIG_BATTCHARGE_MONITOR is not set
@@ -748,12 +753,25 @@
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
-# CONFIG_ADC_AD7877 is not set
-# CONFIG_TIFM_CORE is not set
+# CONFIG_ADC is not set
#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
+
+#
# LED devices
#
CONFIG_NEW_LEDS=y
@@ -777,28 +795,9 @@
#
# Multimedia devices
#
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_DEV is not set
#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
-CONFIG_VIDEO_ADV_DEBUG=y
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_CPIA is not set
-
-#
-# Radio Adapters
-#
-
-#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
@@ -806,15 +805,26 @@
#
# Graphics support
#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=y
+CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
-CONFIG_FB=y
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
@@ -849,12 +859,6 @@
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=y
#
# Sound
@@ -873,10 +877,11 @@
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_SUPPORT_OLD_API=y
# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+CONFIG_SND_DEBUG_DETECT=y
#
# Generic devices
@@ -890,7 +895,7 @@
#
# ALSA ARM devices
#
-# CONFIG_SND_PXA2xx_I2SOUND is not set
+CONFIG_SND_PXA2xx_I2SOUND=y
CONFIG_SND_PXA2XX_PCM=y
CONFIG_SND_PXA2XX_AC97=y
@@ -909,6 +914,7 @@
# HID Devices
#
CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
# USB support
@@ -933,6 +939,7 @@
CONFIG_USB_GADGET_PXA27X=y
CONFIG_USB_PXA27X=y
# CONFIG_USB_PXA27X_DMA is not set
+# CONFIG_USB_GADGET_SX2 is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_MQ11XX is not set
# CONFIG_USB_GADGET_LH7A40X is not set
@@ -949,6 +956,7 @@
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
+# CONFIG_USB_PXA2XX_GPIO is not set
#
# MMC/SD Card support
@@ -957,7 +965,6 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
@@ -979,6 +986,7 @@
#
# RTC drivers
#
+# CONFIG_RTC_DRV_CMOS is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1149,7 +1157,7 @@
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_SMALLOOPS is not set
# CONFIG_DEBUG_KERNEL is not set
@@ -1176,7 +1184,7 @@
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_MD4 is not set
# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_SHA1 is not set
+CONFIG_CRYPTO_SHA1=m
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_WP512 is not set
@@ -1184,8 +1192,10 @@
# CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
@@ -1199,6 +1209,7 @@
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
#
@@ -1214,5 +1225,7 @@
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-05-28 19:47:25
|
Revision: 1011
http://svn.sourceforge.net/hackndev/?rev=1011&view=rev
Author: farcaller
Date: 2007-05-28 12:47:23 -0700 (Mon, 28 May 2007)
Log Message:
-----------
palmt3: clean config, confirmed to work
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig
Modified: linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig 2007-05-28 16:15:13 UTC (rev 1010)
+++ linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig 2007-05-28 19:47:23 UTC (rev 1011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hnd0
-# Mon May 28 17:42:11 2007
+# Linux kernel version: 2.6.21-hnd0-tt3
+# Mon May 28 22:46:09 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,7 +34,7 @@
#
# General setup
#
-CONFIG_LOCALVERSION="-farcaller"
+CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -710,6 +710,8 @@
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
+# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
# CONFIG_TOUCHSCREEN_PALMTC is not set
# CONFIG_TOUCHSCREEN_WM97XX is not set
@@ -885,6 +887,7 @@
CONFIG_EXTERNAL_POWER=m
CONFIG_BATTERY=m
CONFIG_PDA_POWER=m
+# CONFIG_ADC_BATTERY is not set
CONFIG_APM_POWER=m
#
@@ -900,7 +903,10 @@
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_ADC is not set
+CONFIG_ADC=m
+# CONFIG_ADC_ADS7846_SSP is not set
+# CONFIG_ADC_TSC2200_SSP is not set
+# CONFIG_ADC_AD7877 is not set
#
# Multifunction device drivers
@@ -1234,7 +1240,12 @@
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
@@ -1288,7 +1299,7 @@
# CONFIG_NLS_ISO8859_15 is not set
CONFIG_NLS_KOI8_R=m
# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
+CONFIG_NLS_UTF8=y
#
# Distributed Lock Manager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-05-28 16:15:18
|
Revision: 1010
http://svn.sourceforge.net/hackndev/?rev=1010&view=rev
Author: farcaller
Date: 2007-05-28 09:15:13 -0700 (Mon, 28 May 2007)
Log Message:
-----------
palmt3: updated defconfig
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig
Modified: linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig 2007-05-28 15:51:28 UTC (rev 1009)
+++ linux4palm/linux/trunk/arch/arm/configs/palmt3_defconfig 2007-05-28 16:15:13 UTC (rev 1010)
@@ -1,44 +1,63 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hnd0-tt3
-# Wed Nov 1 21:22:55 2006
+# Linux kernel version: 2.6.21-hnd0
+# Mon May 28 17:42:11 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
#
# General setup
#
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-farcaller"
CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
CONFIG_IKCONFIG=y
-# CONFIG_MINIMAL_OOPS is not set
CONFIG_IKCONFIG_PROC=y
+# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE="/home/farcaller/develop/linux4palm/initlive-ng/image"
CONFIG_INITRAMFS_ROOT_UID=0
CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -50,13 +69,12 @@
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
-CONFIG_USELIB=y
-CONFIG_CORE_DUMP=y
CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
-CONFIG_OBSOLETE_INTERMODULE=m
#
# Loadable module support
@@ -71,7 +89,10 @@
#
# Block layer
#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
@@ -89,18 +110,29 @@
#
# System Type
#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS7500 is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
@@ -108,12 +140,8 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -122,12 +150,14 @@
# CONFIG_MACH_LOGICPD_PXA270 is not set
# CONFIG_MACH_MAINSTONE is not set
# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
# CONFIG_ARCH_ESERIES is not set
# CONFIG_MACH_A620 is not set
# CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
# CONFIG_ARCH_H1900 is not set
# CONFIG_ARCH_H2200 is not set
-# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H3900 is not set
# CONFIG_MACH_H4000 is not set
# CONFIG_MACH_H4700 is not set
# CONFIG_MACH_HX2750 is not set
@@ -139,11 +169,17 @@
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
+# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
-# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_MACH_X50 is not set
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_XSCALE_PALMTREO650 is not set
+# CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_TUNGE2 is not set
CONFIG_MACH_T3XSCALE=y
CONFIG_PALM_T3_BUTTONS=y
@@ -152,12 +188,12 @@
# CONFIG_MACH_XSCALE_PALMTX is not set
# CONFIG_MACH_PALMZ72 is not set
# CONFIG_MACH_OMAP_PALMTC is not set
+# CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=y
+CONFIG_GPIOEDNG=y
# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
-CONFIG_PXA_RTC_EPOCH=1904
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
#
# Linux As Bootloader
@@ -173,29 +209,20 @@
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
#
# Processor Features
#
CONFIG_ARM_THUMB=y
-CONFIG_ARMBOOT_PROC=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
+# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Platforms
-#
-
-#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-# CONFIG_IPAQ_HAMCOP is not set
-
-#
# Bus support
#
@@ -207,10 +234,11 @@
#
# Kernel Features
#
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
CONFIG_NO_IDLE_HZ=y
CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -220,6 +248,8 @@
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -229,6 +259,8 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="dyntick=enable"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -265,14 +297,16 @@
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_MISC=m
-# CONFIG_ARTHUR is not set
#
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
CONFIG_PM_DEBUG=y
+CONFIG_DPM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
CONFIG_APM_EMULATION=y
#
@@ -302,13 +336,19 @@
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set
#
@@ -334,7 +374,6 @@
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
@@ -348,8 +387,67 @@
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_PXA_FICP=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_BCM2035UART is not set
+# CONFIG_BT_HCIVHCI is not set
# CONFIG_IEEE80211 is not set
#
@@ -363,6 +461,8 @@
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
@@ -378,19 +478,20 @@
CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
#
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
#
# RAM/ROM/Flash chip drivers
@@ -425,6 +526,7 @@
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
CONFIG_MTD_PALMT3=m
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -462,6 +564,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -473,7 +576,7 @@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=2
CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -487,8 +590,14 @@
#
# CONFIG_RAID_ATTRS is not set
# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
@@ -555,6 +664,7 @@
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
+CONFIG_SLHC=m
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
@@ -569,6 +679,7 @@
# Input device support
#
CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
@@ -596,6 +707,12 @@
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
# CONFIG_INPUT_MISC is not set
#
@@ -610,6 +727,7 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -623,13 +741,44 @@
CONFIG_SERIAL_PXA=y
CONFIG_SERIAL_PXA_CONSOLE=y
CONFIG_SERIAL_PXA_COUNT=4
+# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SA1100_WATCHDOG=m
+CONFIG_HW_RANDOM=m
+# CONFIG_NVRAM is not set
+CONFIG_SA1100_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
# I2C support
#
CONFIG_I2C=y
@@ -646,9 +795,9 @@
#
# I2C Hardware Bus support
#
-# CONFIG_I2C_ELV is not set
CONFIG_I2C_PXA=y
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_PCA_ISA is not set
@@ -664,6 +813,7 @@
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCA9535 is not set
# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
CONFIG_TPS65010=m
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_I2C_DEBUG_CORE is not set
@@ -672,41 +822,6 @@
# CONFIG_I2C_DEBUG_CHIP is not set
#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-CONFIG_SA1100_RTC=y
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
# SPI support
#
# CONFIG_SPI is not set
@@ -722,9 +837,11 @@
#
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_ASB100 is not set
@@ -748,37 +865,60 @@
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
#
-# SoC drivers
+# Hardware Monitoring - external power and batteries
#
-# CONFIG_SOC_MQ11XX is not set
-# CONFIG_SOC_T7L66XB is not set
-# CONFIG_SOC_TC6387XB is not set
-# CONFIG_SOC_TC6393XB is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-CONFIG_SOC_TSC2101=m
+CONFIG_EXTERNAL_POWER=m
+CONFIG_BATTERY=m
+CONFIG_PDA_POWER=m
+CONFIG_APM_POWER=m
#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+
+#
# Misc devices
#
-CONFIG_BATTERY=y
+# CONFIG_BATTCHARGE_MONITOR is not set
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_MCP is not set
+# CONFIG_ADC is not set
#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+CONFIG_SOC_TSC2101=m
+# CONFIG_SOC_TSC2200 is not set
+
+#
# LED devices
#
# CONFIG_NEW_LEDS is not set
@@ -795,7 +935,6 @@
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
#
# Digital Video Broadcasting Devices
@@ -805,19 +944,33 @@
#
# Graphics support
#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=y
CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_FIRMWARE_EDID is not set
+# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VSFB is not set
#
# Console display driver support
@@ -842,12 +995,6 @@
# Logo configuration
#
# CONFIG_LOGO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=y
-# CONFIG_LCD_CLASS_DEVICE is not set
#
# Sound
@@ -876,6 +1023,7 @@
#
# Generic devices
#
+CONFIG_SND_AC97_CODEC=m
CONFIG_SND_DUMMY=m
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
@@ -885,23 +1033,29 @@
#
# ALSA ARM devices
#
-# CONFIG_SND_A716 is not set
-# CONFIG_SND_H1910 is not set
-# CONFIG_SND_H2200 is not set
-# CONFIG_SND_H4000 is not set
-# CONFIG_SND_HTCMAGICIAN is not set
-# CONFIG_SND_HX4700 is not set
-# CONFIG_SND_HTCUNIVERSAL is not set
-# CONFIG_SND_H5XXX_AK4535 is not set
CONFIG_SND_PXA2xx_I2SOUND=m
-# CONFIG_SND_PXA2XX_AC97 is not set
+CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_AC97=m
+# CONFIG_SND_RECON is not set
#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
@@ -924,9 +1078,11 @@
CONFIG_USB_PXA2XX=y
# CONFIG_USB_PXA2XX_SMALL is not set
# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_SX2 is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_MQ11XX is not set
# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -935,10 +1091,11 @@
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
+# CONFIG_USB_PXA2XX_GPIO is not set
#
# MMC/SD Card support
@@ -949,30 +1106,57 @@
# CONFIG_MMC_PXA is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
-# CONFIG_MMC_ASIC3 is not set
CONFIG_MMC_WBSD_PALMT3=m
#
# Real Time Clock
#
CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_EPOCH=1970
#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=m
+# CONFIG_RTC_INTF_PROC is not set
+# CONFIG_RTC_INTF_DEV is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=m
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
# File systems
#
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
@@ -999,8 +1183,10 @@
# Pseudo filesystems
#
CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set
@@ -1015,19 +1201,20 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
+# CONFIG_SQUASHFS is not set
+CONFIG_SQUASHFS_LZMA=y
+# CONFIG_SQUASHFS_LZMA_EMBEDDED is not set
+CONFIG_SQUASHFS_LZMA_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZMA_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-CONFIG_UNION_FS=y
+CONFIG_UNION_FS=m
+# CONFIG_UNION_FS_XATTR is not set
#
# Network File Systems
@@ -1045,7 +1232,8 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
@@ -1103,6 +1291,11 @@
CONFIG_NLS_UTF8=m
#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
# Profiling support
#
# CONFIG_PROFILING is not set
@@ -1111,28 +1304,37 @@
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
CONFIG_SMALLOOPS=y
CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_DETECT_SOFTLOCKUP is not set
# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
# CONFIG_FORCED_INLINING is not set
# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
-# CONFIG_DEBUG_ERRORS is not set
+CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_LL is not set
#
@@ -1145,7 +1347,11 @@
# Cryptographic options
#
CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=m
@@ -1154,7 +1360,13 @@
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
@@ -1168,6 +1380,7 @@
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
#
@@ -1177,8 +1390,12 @@
#
# Library routines
#
+CONFIG_BITREVERSE=y
CONFIG_CRC_CCITT=m
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-05-28 15:51:29
|
Revision: 1009
http://svn.sourceforge.net/hackndev/?rev=1009&view=rev
Author: marex_z71
Date: 2007-05-28 08:51:28 -0700 (Mon, 28 May 2007)
Log Message:
-----------
PalmTC: touchscreen driver fixes, new battery framework support etc
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/input/touchscreen/palmtc_ts.c
Modified: linux4palm/linux/trunk/drivers/input/touchscreen/palmtc_ts.c
===================================================================
--- linux4palm/linux/trunk/drivers/input/touchscreen/palmtc_ts.c 2007-05-28 15:50:47 UTC (rev 1008)
+++ linux4palm/linux/trunk/drivers/input/touchscreen/palmtc_ts.c 2007-05-28 15:51:28 UTC (rev 1009)
@@ -31,9 +31,8 @@
#include <linux/ctype.h>
#include <linux/battery.h>
#include <linux/leds.h>
+#include <linux/apm-emulation.h>
-#include <asm/apm.h>
-
#include <asm/arch/palmtc-gpio.h>
#include <asm/arch/gpio.h>
@@ -70,7 +69,7 @@
struct ucb1400_battery_dev bat;
-#ifdef CONFIG_APM
+#ifdef CONFIG_APM_EMULATION
#define APM_MIN_INTERVAL 1000
struct ucb1400 *ucb_static_copy;
struct mutex apm_mutex;
@@ -82,17 +81,29 @@
static inline u16 ucb1400_reg_read(struct ucb1400 *ucb, u16 reg)
{
- return ucb->ac97->bus->ops->read(ucb->ac97, reg);
+ if (ucb->ac97)
+ return ucb->ac97->bus->ops->read(ucb->ac97, reg);
+ else
+ return -1;
}
static inline void ucb1400_reg_write(struct ucb1400 *ucb, u16 reg, u16 val)
{
- ucb->ac97->bus->ops->write(ucb->ac97, reg, val);
+ if (ucb->ac97)
+ ucb->ac97->bus->ops->write(ucb->ac97, reg, val);
}
static inline void ucb1400_adc_enable(struct ucb1400 *ucb)
{
- ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA);
+ u16 val=0;
+
+ ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA);
+ val=ucb1400_reg_read(ucb, UCB_IE_RIS);
+ ucb1400_reg_write(ucb, UCB_IE_RIS, val | UCB_IE_ADC);
+ val=ucb1400_reg_read(ucb, UCB_IE_FAL);
+ ucb1400_reg_write(ucb, UCB_IE_FAL, val | UCB_IE_ADC);
+
+/* ucb1400_reg_write(ucb, UCB_ADC_CR, UCB_ADC_ENA); */
}
static unsigned int ucb1400_adc_read(struct ucb1400 *ucb, u16 adc_channel)
@@ -119,7 +130,16 @@
static inline void ucb1400_adc_disable(struct ucb1400 *ucb)
{
- ucb1400_reg_write(ucb, UCB_ADC_CR, 0);
+ u16 val=0;
+
+ val &= ~UCB_ADC_ENA;
+ ucb1400_reg_write(ucb, UCB_ADC_CR, val);
+ val=ucb1400_reg_read(ucb, UCB_IE_RIS);
+ ucb1400_reg_write(ucb, UCB_IE_RIS, val & (~UCB_IE_ADC));
+ val=ucb1400_reg_read(ucb, UCB_IE_FAL);
+ ucb1400_reg_write(ucb, UCB_IE_FAL, val & (~UCB_IE_ADC));
+/* ucb1400_reg_write(ucb, UCB_ADC_CR, 0);
+*/
}
/* Switch to interrupt mode. */
@@ -338,12 +358,10 @@
*/
if ((strlen(buf)>3) && strncmp(buf,"w",1))
{
- printk("D'OH! - 1\n");
return -EINVAL;
}
if ((strlen(buf)>4) && !(strncmp(buf,"w",1)))
{
- printk("D'OH! - 2\n");
return -EINVAL;
}
if (!(isdigit(buf[1])))
@@ -426,6 +444,19 @@
}
}
+int ucb1400_battery_get_capacity(struct battery *b)
+{
+ if (bat.battery_registered){
+ return (((ucb1400_battery_get_voltage(b)-ucb1400_battery_min_voltage(b))
+ /(ucb1400_battery_max_voltage(b)-ucb1400_battery_min_voltage(b)))*100);
+ }
+ else{
+ printk( "ucb1400_battery: cannot get capacity -> "
+ "battery driver unregistered\n");
+ return 0;
+ }
+}
+
int ucb1400_battery_get_status(struct battery *b)
{
int ac_connected = gpio_get_value(GPIO_NR_PALMTC_POWER_DETECT);
@@ -446,16 +477,56 @@
return BATTERY_STATUS_DISCHARGING;
}
+int tmp;
+
+static void *ucb1400_battery_get_property(struct battery *b, enum battery_property bp)
+{
+ switch (bp) {
+ case BATTERY_PROP_VOLTAGE_MAX_DESIGN:
+ tmp = ucb1400_battery_max_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_VOLTAGE_MIN_DESIGN:
+ tmp = ucb1400_battery_min_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_CHARGE_FULL_DESIGN:
+ tmp = 100;
+ return &tmp;
+ case BATTERY_PROP_CHARGE_EMPTY_DESIGN:
+ tmp = 0;
+ return &tmp;
+ case BATTERY_PROP_CHARGE_NOW:
+ tmp = ucb1400_battery_get_capacity(b);
+ return &tmp;
+ case BATTERY_PROP_VOLTAGE_NOW:
+ tmp = ucb1400_battery_get_voltage(b);
+ return &tmp;
+ case BATTERY_PROP_STATUS:
+ tmp = ucb1400_battery_get_status(b);
+ return &tmp;
+ default: break;
+ };
+
+ return NULL;
+}
+
+static enum battery_property ucb1400_battery_props[] = {
+ BATTERY_PROP_VOLTAGE_MAX_DESIGN,
+ BATTERY_PROP_VOLTAGE_MIN_DESIGN,
+ BATTERY_PROP_CHARGE_FULL_DESIGN,
+ BATTERY_PROP_CHARGE_EMPTY_DESIGN,
+ BATTERY_PROP_CHARGE_NOW,
+ BATTERY_PROP_VOLTAGE_NOW,
+ BATTERY_PROP_STATUS,
+};
+
struct battery ucb1400_battery = {
- .name = "ucb1400_battery",
- .id = "battery0",
- .get_min_voltage = ucb1400_battery_min_voltage,
- .get_max_voltage = ucb1400_battery_max_voltage,
- .get_voltage = ucb1400_battery_get_voltage,
- .get_status = ucb1400_battery_get_status,
+ .name = "ucb1400_battery",
+ .get_property = ucb1400_battery_get_property,
+ .properties = ucb1400_battery_props,
+ .num_properties = ARRAY_SIZE(ucb1400_battery_props),
};
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
static void ucb1400_get_power_status(struct apm_power_info *info)
{
struct ucb1400 *ucb=ucb_static_copy;
@@ -835,7 +906,7 @@
/* register battery to APM layer */
bat.battery_registered = 0;
- if(battery_class_register(&ucb1400_battery)) {
+ if(battery_register(NULL, &ucb1400_battery)) {
printk(KERN_ERR "ucb1400_ts: could not register battery class\n");
} else {
bat.battery_registered = 1;
@@ -856,7 +927,7 @@
ucb_static_copy=ucb; //sorry for this, apm-power-function doesnt have a parm to pass dev...
-#ifdef CONFIG_APM
+#ifdef CONFIG_APM_EMULATION
printk("PROBING BATTERY\n");
pwr_info.ac_line_status=APM_AC_UNKNOWN;
pwr_info.battery_status=APM_BATTERY_STATUS_UNKNOWN;
@@ -891,7 +962,7 @@
led_classdev_unregister(&ucb1400_gpio_vibra);
led_classdev_unregister(&ucb1400_gpio_led);
- battery_class_register(&ucb1400_battery);
+ battery_unregister(&ucb1400_battery);
free_irq(ucb->irq, ucb);
input_unregister_device(ucb->ts_idev);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
