[oe-commits] org.oe.dev merge of '0fd25dfc18f365d3b975a9657dae8f1afebdfbc1'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Aug 22 10:45:16 UTC 2007
merge of '0fd25dfc18f365d3b975a9657dae8f1afebdfbc1'
and 'e542d3248b64e2f2a33ea5db5feb00bd3806167d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 07b7a00cd47af0555ac72032429c0ef42baad5ec
ViewMTN: http://monotone.openembedded.org/revision.psp?id=07b7a00cd47af0555ac72032429c0ef42baad5ec
Files:
1
conf/distro/include/sane-srcdates.inc
packages/classpath/classpath-minimal.inc
packages/kxml2
packages/linux/linux-2.6.21
packages/linux/linux-2.6.21/gumstix
packages/kxml2/kxml2_2.3.0.bb
packages/linux/linux-2.6.21/270-usb-gadget-udc.patch
packages/linux/linux-2.6.21/arch-config.patch
packages/linux/linux-2.6.21/bkpxa-pxa-cpu.patch
packages/linux/linux-2.6.21/bkpxa-pxa-cpufreq.patch
packages/linux/linux-2.6.21/board-init.patch
packages/linux/linux-2.6.21/bugfix-i2c-include.patch
packages/linux/linux-2.6.21/bugfix-mmc-clock.patch
packages/linux/linux-2.6.21/bugfix-pxa-cpufreq.patch
packages/linux/linux-2.6.21/bugfix-serial-interrupt.patch
packages/linux/linux-2.6.21/bugfix-serial-register-status.patch
packages/linux/linux-2.6.21/compact-flash.patch
packages/linux/linux-2.6.21/compile-fix-pxa_cpufreq.patch
packages/linux/linux-2.6.21/cpufreq-better-freqs.patch
packages/linux/linux-2.6.21/cpufreq-fixup.patch
packages/linux/linux-2.6.21/cpufreq-ondemand-by-default.patch
packages/linux/linux-2.6.21/defconfig.patch
packages/linux/linux-2.6.21/disable-uncompress-message.patch
packages/linux/linux-2.6.21/ethernet-config.patch
packages/linux/linux-2.6.21/flash.patch
packages/linux/linux-2.6.21/gumstix/defconfig
packages/linux/linux-2.6.21/gumstix-asoc.patch
packages/linux/linux-2.6.21/gumstix-fb-logo.patch
packages/linux/linux-2.6.21/gumstix-pxa270-usb-host.patch
packages/linux/linux-2.6.21/header.patch
packages/linux/linux-2.6.21/mach-types-fix.patch
packages/linux/linux-2.6.21/misalignment-handling.patch
packages/linux/linux-2.6.21/mmc-card-detect.patch
packages/linux/linux-2.6.21/modular-init-bluetooth.patch
packages/linux/linux-2.6.21/modular-init-smc91x.patch
packages/linux/linux-2.6.21/modular-init-usb-gadget.patch
packages/linux/linux-2.6.21/pcm-gcc-411-bugfix.patch
packages/linux/linux-2.6.21/proc-gpio.patch
packages/linux/linux-2.6.21/pxa-regs-additions.patch
packages/linux/linux-2.6.21/pxa-regs-fixup.patch
packages/linux/linux-2.6.21/pxa2xx_udc.patch
packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch
packages/linux/linux-2.6.21/pxafb-definition.patch
packages/linux/linux-2.6.21/ramfs-mode-support.patch
packages/linux/linux-2.6.21/serial-divisor.patch
packages/linux/linux-2.6.21/serial-ether-addr.patch
packages/linux/linux-2.6.21/smc-ether-addr.patch
packages/linux/linux-2.6.21/uImage-in-own-partition.patch
packages/linux/linux-2.6.21/ucb1400-ac97-audio.patch
conf/machine/compulab-pxa270.conf
conf/machine/fic-gta01.conf
conf/machine/gumstix.conf
packages/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.95.bb
packages/geoclue/geoclue_git.bb
packages/initscripts/initscripts-1.0/save-rtc.sh
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux.inc
packages/linux/linux_2.6.21.bb
packages/wv/wv_1.2.0.bb
Diffs:
#
# mt diff -r0fd25dfc18f365d3b975a9657dae8f1afebdfbc1 -r07b7a00cd47af0555ac72032429c0ef42baad5ec
#
#
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [ccb3a58cdc94f8b3782b9c1addc3638f883f4b83]
# to [f1ab446a8fd03f4c3c21fe929989805983c34b8d]
#
============================================================
--- conf/distro/include/sane-srcdates.inc ccb3a58cdc94f8b3782b9c1addc3638f883f4b83
+++ conf/distro/include/sane-srcdates.inc f1ab446a8fd03f4c3c21fe929989805983c34b8d
@@ -40,6 +40,9 @@ SRCDATE_zaurusd ?= "20060628"
SRCDATE_web ?= "20060613"
SRCDATE_zaurusd ?= "20060628"
+# OpenMoko
+SRCDATE_uboot-openmoko = "20070820"
+
# GPE
SRCDATE_dasher-gpe ?= "20060814"
SRCDATE_rosetta ?= "20060804"
#
# mt diff -re542d3248b64e2f2a33ea5db5feb00bd3806167d -r07b7a00cd47af0555ac72032429c0ef42baad5ec
#
#
#
# delete "packages/classpath/classpath-minimal.inc"
#
# add_dir "packages/kxml2"
#
# add_dir "packages/linux/linux-2.6.21"
#
# add_dir "packages/linux/linux-2.6.21/gumstix"
#
# add_file "packages/kxml2/kxml2_2.3.0.bb"
# content [7c4ff792800980cb83dfb9edf16c2672f5940354]
#
# add_file "packages/linux/linux-2.6.21/270-usb-gadget-udc.patch"
# content [46d1e25ee8c6b2057ad12fef37ecff405ac5e046]
#
# add_file "packages/linux/linux-2.6.21/arch-config.patch"
# content [77e962d186fbf986a7150fcf92fc7e9a2f2e3c6c]
#
# add_file "packages/linux/linux-2.6.21/bkpxa-pxa-cpu.patch"
# content [61c42220d83235a7ed992b29a5be2b15f23c0022]
#
# add_file "packages/linux/linux-2.6.21/bkpxa-pxa-cpufreq.patch"
# content [189b51b1ebd33e9e49934cc272a151dd27314737]
#
# add_file "packages/linux/linux-2.6.21/board-init.patch"
# content [d713b018e314e882ff245ce9fb326a9614bee226]
#
# add_file "packages/linux/linux-2.6.21/bugfix-i2c-include.patch"
# content [2cc5db320546c0c376dc4ce82183109232b4a4a7]
#
# add_file "packages/linux/linux-2.6.21/bugfix-mmc-clock.patch"
# content [453917381c5760514750f165957c49b478ffc65c]
#
# add_file "packages/linux/linux-2.6.21/bugfix-pxa-cpufreq.patch"
# content [7107883474ca1adbd13644873540c034005a19ed]
#
# add_file "packages/linux/linux-2.6.21/bugfix-serial-interrupt.patch"
# content [61a140ba63e9d2a85c0a659d7db18f46f661fddd]
#
# add_file "packages/linux/linux-2.6.21/bugfix-serial-register-status.patch"
# content [5947e11a809c8053638b1e70b3f5f544fa60af64]
#
# add_file "packages/linux/linux-2.6.21/compact-flash.patch"
# content [4097907bb3d341271ccf00ade8a0d937ab2e70d4]
#
# add_file "packages/linux/linux-2.6.21/compile-fix-pxa_cpufreq.patch"
# content [922480ad3b67a47f4da75e43d52f036c56074b4e]
#
# add_file "packages/linux/linux-2.6.21/cpufreq-better-freqs.patch"
# content [8c8edc8e89041dd1b031e376970c2c3f594b215f]
#
# add_file "packages/linux/linux-2.6.21/cpufreq-fixup.patch"
# content [2db68113b34b6973ceae2dfdec52a59c3d1e558a]
#
# add_file "packages/linux/linux-2.6.21/cpufreq-ondemand-by-default.patch"
# content [44a99a89c462703ccc42e071e63960a550d025c0]
#
# add_file "packages/linux/linux-2.6.21/defconfig.patch"
# content [36b01c2f21608396fe7da5c8aba9aad2810a6939]
#
# add_file "packages/linux/linux-2.6.21/disable-uncompress-message.patch"
# content [db4d24d8f7d6449fc24795635b90d0df15c97bc1]
#
# add_file "packages/linux/linux-2.6.21/ethernet-config.patch"
# content [0debcec19adacd79ffaab0baea1f8bee70fcb16c]
#
# add_file "packages/linux/linux-2.6.21/flash.patch"
# content [028683f763c8358b0f1c076926660440cc783c3d]
#
# add_file "packages/linux/linux-2.6.21/gumstix/defconfig"
# content [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
#
# add_file "packages/linux/linux-2.6.21/gumstix-asoc.patch"
# content [672e82d740da0eefc64b737ada85c935d289999c]
#
# add_file "packages/linux/linux-2.6.21/gumstix-fb-logo.patch"
# content [a28f1499776f44a83ad92ed1ad935d24910ed98b]
#
# add_file "packages/linux/linux-2.6.21/gumstix-pxa270-usb-host.patch"
# content [89cb49be5d3e523794982ddbd2908bf141174bc1]
#
# add_file "packages/linux/linux-2.6.21/header.patch"
# content [1a15dda271c62ef51928e06d14a61bd20f7fc32c]
#
# add_file "packages/linux/linux-2.6.21/mach-types-fix.patch"
# content [18d504ef0214d52e33d2b8a577e0c2dfb8aa0663]
#
# add_file "packages/linux/linux-2.6.21/misalignment-handling.patch"
# content [27f8266aa43f862763f684ed8d6ef944d5883850]
#
# add_file "packages/linux/linux-2.6.21/mmc-card-detect.patch"
# content [02f4c903d4cd18a0a7f1f6b3dbbb2268d96d09de]
#
# add_file "packages/linux/linux-2.6.21/modular-init-bluetooth.patch"
# content [7121c06e9b7abb1bead874386960934fc97e824b]
#
# add_file "packages/linux/linux-2.6.21/modular-init-smc91x.patch"
# content [95c46437bdc083831d12dfbc91ddc43a092fe687]
#
# add_file "packages/linux/linux-2.6.21/modular-init-usb-gadget.patch"
# content [e2c91ef570684c54b0ff393820b15d0fcd5812dd]
#
# add_file "packages/linux/linux-2.6.21/pcm-gcc-411-bugfix.patch"
# content [8c06dbae7910651bbcd8731d6851454f1c47d459]
#
# add_file "packages/linux/linux-2.6.21/proc-gpio.patch"
# content [5e31326fd32827afc39c0edb84d13f4384cf232b]
#
# add_file "packages/linux/linux-2.6.21/pxa-regs-additions.patch"
# content [ee3725192f4fc6fcad730b0bbbe7374351e551f9]
#
# add_file "packages/linux/linux-2.6.21/pxa-regs-fixup.patch"
# content [c0c412734d4bc015112b1d6eb7b6a56359b772fc]
#
# add_file "packages/linux/linux-2.6.21/pxa2xx_udc.patch"
# content [16ea985d508ff9f01b790060b0dd95a8ad2b7969]
#
# add_file "packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch"
# content [e2975bb2f4a9275bce85a586e82e13259c28fec6]
#
# add_file "packages/linux/linux-2.6.21/pxafb-definition.patch"
# content [e5b26a71fa9b5f9747529b0c2e4511ba69a62863]
#
# add_file "packages/linux/linux-2.6.21/ramfs-mode-support.patch"
# content [fbd5e754e2c544fd036504b685f88f3aa963189c]
#
# add_file "packages/linux/linux-2.6.21/serial-divisor.patch"
# content [75684ee587587dacdb2a0ccfeeb394be85cdee49]
#
# add_file "packages/linux/linux-2.6.21/serial-ether-addr.patch"
# content [e93b779ef26803beb9c01abaf035039df4dfdb11]
#
# add_file "packages/linux/linux-2.6.21/smc-ether-addr.patch"
# content [3e7823c1cf361019e3536add7917cb5f60278370]
#
# add_file "packages/linux/linux-2.6.21/uImage-in-own-partition.patch"
# content [440fe8c2946d0f307271094a940cdcd50526f92d]
#
# add_file "packages/linux/linux-2.6.21/ucb1400-ac97-audio.patch"
# content [07aab28f12b91f580ecb82ec23cb5431185dff7c]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [d1c4d22022e1eaefa1637b8babd925a8cb738cde]
# to [443c1803d7863d67b5739f263a3ddcb7473b2736]
#
# patch "conf/machine/fic-gta01.conf"
# from [1ef7e5d0dd0d861d301d9817a3ef3cf36959179d]
# to [1f95cfda3ceeee646ee03718c50280ea1818fa58]
#
# patch "conf/machine/gumstix.conf"
# from [c62a04e5981d2e5ed4096ac6667138f90e8e01d6]
# to [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
#
# patch "packages/classpath/classpath-minimal-native_0.95.bb"
# from [a3710719a4819aacb9839dd5aaa9a92b703a74f6]
# to [c2f37c60e37490ac94dd3774919d805ede5de1be]
#
# patch "packages/classpath/classpath-minimal_0.95.bb"
# from [1e37a31c37529a51633ba1087ed6429090784b95]
# to [85a438ea63e8e5790dca42e27ef3b9318d4dee3f]
#
# patch "packages/geoclue/geoclue_git.bb"
# from [c5a3d2adf2b42eac3d326986a0d339213f41376e]
# to [41a9cfe777c671fde4cfbf21bc73e65fffa0fb5a]
#
# patch "packages/initscripts/initscripts-1.0/save-rtc.sh"
# from [9b1d470537af18827367537206420cc5f66f877e]
# to [6af9ccb6d852efaecd4b9d74c447997b112f416b]
#
# patch "packages/linux/compulab-pxa270_2.6.22.bb"
# from [1bdb034c9f1a50b53b64d34bec8b58051d785b39]
# to [1a80d7460ebc2607dd83a23a548a4a7c623f7aa9]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [0b85356181b86aff883e8c239db19375dceb5900]
# to [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [efd1223458f6c9ab6ac8ddba666e5e4b0d3a14ac]
# to [dc32409e752ed5db7c5885ac404c458875c5cb87]
#
# patch "packages/linux/linux.inc"
# from [a948d889b8d420c7a04eb140caaa353601fa7722]
# to [c10bdb5404160b2e9ec7235b03d80a9825c27f77]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [d6e50b673f16999146443b578b809addead0109d]
# to [ba51fa252ec8e5f423145d8b34259d0a8a42c124]
#
# patch "packages/wv/wv_1.2.0.bb"
# from [4041946dc0833b27cf6bc2b0e91ac6b51e3fe3f4]
# to [d5cae2d72683d8d4c698822ec4699cba938841f2]
#
============================================================
--- packages/kxml2/kxml2_2.3.0.bb 7c4ff792800980cb83dfb9edf16c2672f5940354
+++ packages/kxml2/kxml2_2.3.0.bb 7c4ff792800980cb83dfb9edf16c2672f5940354
@@ -0,0 +1,33 @@
+DESCRIPTION = "kxml2 is a small XML pull parser"
+HOMEPAGE = "http://kxml.sourceforge.net/"
+LICENSE = "BSD"
+PRIORITY = "optional"
+PR = "r0"
+
+
+JAR = ${PN}-${PV}.jar
+
+SRC_URI = "http://downloads.sourceforge.net/kxml/${JAR}"
+
+
+do_unpack() {
+ :
+}
+
+do_install() {
+
+install -d ${D}${datadir}/java
+install -m 0644 ${DL_DIR}/${JAR} ${D}${datadir}/java
+
+}
+
+do_stage() {
+
+install -d ${STAGING_DATADIR}/java
+install -m 0644 ${DL_DIR}/${JAR} ${STAGING_DATADIR}/java
+
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/java/${JAR}"
============================================================
--- packages/linux/linux-2.6.21/270-usb-gadget-udc.patch 46d1e25ee8c6b2057ad12fef37ecff405ac5e046
+++ packages/linux/linux-2.6.21/270-usb-gadget-udc.patch 46d1e25ee8c6b2057ad12fef37ecff405ac5e046
@@ -0,0 +1,2739 @@
+Index: linux-2.6.21gum/drivers/usb/gadget/Kconfig
+===================================================================
+--- linux-2.6.21gum.orig/drivers/usb/gadget/Kconfig
++++ linux-2.6.21gum/drivers/usb/gadget/Kconfig
+@@ -129,6 +129,28 @@ config USB_PXA2XX_SMALL
+ default y if USB_ETH
+ default y if USB_G_SERIAL
+
++config USB_GADGET_PXA27X
++ boolean "PXA 27x"
++ depends on ARCH_PXA && PXA27x
++ help
++ Intel's PXA 27x series XScale ARM-5TE processors include
++ an integrated full speed USB 1.1 device controller.
++
++ Say "y" to link the driver statically, or "m" to build a
++ dynamically linked module called "pxa27x_udc" and force all
++ gadget drivers to also be dynamically linked.
++
++config USB_PXA27X
++ tristate
++ depends on USB_GADGET_PXA27X
++ default USB_GADGET
++ select USB_GADGET_SELECTED
++
++config USB_PXA27X_DMA
++ bool # "Use DMA support"
++ depends on USB_GADGET_PXA27X
++ default n
++
+ config USB_GADGET_GOKU
+ boolean "Toshiba TC86C001 'Goku-S'"
+ depends on PCI
+Index: linux-2.6.21gum/drivers/usb/gadget/Makefile
+===================================================================
+--- linux-2.6.21gum.orig/drivers/usb/gadget/Makefile
++++ linux-2.6.21gum/drivers/usb/gadget/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_USB_PXA2XX) += pxa2xx_udc.o
+ obj-$(CONFIG_USB_GOKU) += goku_udc.o
+ obj-$(CONFIG_USB_OMAP) += omap_udc.o
+ obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o
++obj-$(CONFIG_USB_PXA27X) += pxa27x_udc.o
+ obj-$(CONFIG_USB_AT91) += at91_udc.o
+ obj-$(CONFIG_USB_GADGET_GUMSTIX) += gumstix_gadget.o
+
+Index: linux-2.6.21gum/drivers/usb/gadget/pxa27x_udc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21gum/drivers/usb/gadget/pxa27x_udc.c
+@@ -0,0 +1,2352 @@
++/*
++ * linux/drivers/usb/gadget/pxa27x_udc.c
++ * Intel PXA2xx and IXP4xx on-chip full speed USB device controllers
++ *
++ * Copyright (C) 2002 Intrinsyc, Inc. (Frank Becker)
++ * Copyright (C) 2003 Robert Schwebel, Pengutronix
++ * Copyright (C) 2003 Benedikt Spranger, Pengutronix
++ * Copyright (C) 2003 David Brownell
++ * Copyright (C) 2003 Joshua Wise
++ * Copyright (C) 2004 Intel Corporation
++ * Copyright (C) 2005 SDG Systems, LLC (Aric Blumer)
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#undef DEBUG
++ // #define DEBUG 1
++ //#define VERBOSE DBG_VERBOSE
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/ioport.h>
++#include <linux/types.h>
++#include <linux/version.h>
++#include <linux/errno.h>
++#include <linux/delay.h>
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/timer.h>
++#include <linux/list.h>
++#include <linux/interrupt.h>
++#include <linux/proc_fs.h>
++#include <linux/mm.h>
++#include <linux/platform_device.h>
++#include <linux/dma-mapping.h>
++#include <linux/irq.h>
++
++#include <asm/byteorder.h>
++#include <asm/dma.h>
++#include <asm/io.h>
++#include <asm/system.h>
++#include <asm/mach-types.h>
++#include <asm/unaligned.h>
++#include <asm/hardware.h>
++#include <asm/mach/irq.h>
++#include <asm/arch/pxa-regs.h>
++
++#include <linux/usb/ch9.h>
++#include <linux/usb_gadget.h>
++
++#include <asm/arch/udc.h>
++
++
++/*
++ * This driver handles the USB Device Controller (UDC) in Intel's PXA 27777777x
++ * series processors.
++ * Such controller drivers work with a gadget driver. The gadget driver
++ * returns descriptors, implements configuration and data protocols used
++ * by the host to interact with this device, and allocates endpoints to
++ * the different protocol interfaces. The controller driver virtualizes
++ * usb hardware so that the gadget drivers will be more portable.
++ *
++ * This UDC hardware wants to implement a bit too much USB protocol, so
++ * it constrains the sorts of USB configuration change events that work.
++ * The errata for these chips are misleading; some "fixed" bugs from
++ * pxa250 a0/a1 b0/b1/b2 sure act like they're still there.
++ */
++
++#define DRIVER_VERSION "21-Jul-2005"
++#define DRIVER_DESC "PXA 27x USB Device Controller driver"
++
++
++static const char driver_name [] = "pxa27x_udc";
++
++static const char ep0name [] = "ep0";
++
++
++#define USE_DMA
++//#define DISABLE_TEST_MODE
++
++#ifdef CONFIG_PROC_FS
++#define UDC_PROC_FILE
++#endif
++
++#include "pxa27x_udc.h"
++
++#if 0
++#ifdef CONFIG_EMBEDDED
++/* few strings, and little code to use them */
++#undef DEBUG
++#undef UDC_PROC_FILE
++#endif
++#endif
++
++#ifdef USE_DMA
++static int use_dma = 1;
++module_param(use_dma, bool, 0);
++MODULE_PARM_DESC (use_dma, "true to use dma");
++
++static void dma_nodesc_handler (int dmach, void *_ep);
++static void kick_dma(struct pxa27x_ep *ep, struct pxa27x_request *req);
++
++#define DMASTR " (dma support)"
++
++#else /* !USE_DMA */
++#define DMASTR " (pio only)"
++#endif
++
++#ifdef CONFIG_USB_PXA27X_SMALL
++#define SIZE_STR " (small)"
++#else
++#define SIZE_STR ""
++#endif
++
++#ifdef DISABLE_TEST_MODE
++/* (mode == 0) == no undocumented chip tweaks
++ * (mode & 1) == double buffer bulk IN
++ * (mode & 2) == double buffer bulk OUT
++ * ... so mode = 3 (or 7, 15, etc) does it for both
++ */
++static ushort fifo_mode = 0;
++module_param(fifo_mode, ushort, 0);
++MODULE_PARM_DESC (fifo_mode, "pxa27x udc fifo mode");
++#endif
++
++#define UDCISR0_IR0 0x3
++#define UDCISR_INT_MASK (UDC_INT_FIFOERROR | UDC_INT_PACKETCMP)
++#define UDCICR_INT_MASK UDCISR_INT_MASK
++
++#define UDCCSR_MASK (UDCCSR_FST | UDCCSR_DME)
++/* ---------------------------------------------------------------------------
++ * endpoint related parts of the api to the usb controller hardware,
++ * used by gadget driver; and the inner talker-to-hardware core.
++ * ---------------------------------------------------------------------------
++ */
++
++static void pxa27x_ep_fifo_flush (struct usb_ep *ep);
++static void nuke (struct pxa27x_ep *, int status);
++
++static void pio_irq_enable(int ep_num)
++{
++ if (ep_num < 16)
++ UDCICR0 |= 3 << (ep_num * 2);
++ else {
++ ep_num -= 16;
++ UDCICR1 |= 3 << (ep_num * 2);
++ }
++}
++
++static void pio_irq_disable(int ep_num)
++{
++ ep_num &= 0xf;
++ if (ep_num < 16)
++ UDCICR0 &= ~(3 << (ep_num * 2));
++ else {
++ ep_num -= 16;
++ UDCICR1 &= ~(3 << (ep_num * 2));
++ }
++}
++
++/* The UDCCR reg contains mask and interrupt status bits,
++ * so using '|=' isn't safe as it may ack an interrupt.
++ */
++#define UDCCR_MASK_BITS (UDCCR_OEN | UDCCR_UDE)
++
++static inline void udc_set_mask_UDCCR(int mask)
++{
++ UDCCR = (UDCCR & UDCCR_MASK_BITS) | (mask & UDCCR_MASK_BITS);
++}
++
++static inline void udc_clear_mask_UDCCR(int mask)
++{
++ UDCCR = (UDCCR & UDCCR_MASK_BITS) & ~(mask & UDCCR_MASK_BITS);
++}
++
++static inline void udc_ack_int_UDCCR(int mask)
++{
++ /* udccr contains the bits we dont want to change */
++ __u32 udccr = UDCCR & UDCCR_MASK_BITS;
++
++ UDCCR = udccr | %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list