[oe-commits] Koen Kooi : ptp-gadget: fix breakages when used with musb_hdrc controllers

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 644465cefaaedb2c40140c225d5e1f539931aeb1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=644465cefaaedb2c40140c225d5e1f539931aeb1

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri May 29 17:05:24 2009 +0200

ptp-gadget: fix breakages when used with musb_hdrc controllers

---

 .../0001-Fix-musb_hdrc-EP_STATUS_NAME.patch        |   33 ++++++++++++++++++++
 recipes/gphoto2/ptp-gadget_git.bb                  |    4 ++-
 2 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch b/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch
new file mode 100644
index 0000000..80ddf2c
--- /dev/null
+++ b/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch
@@ -0,0 +1,33 @@
+From b78a6fe59f5d093c8841a7c2da661af81f762018 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at dominion.thruhere.net>
+Date: Fri, 29 May 2009 16:52:10 +0200
+Subject: [ptp-gadget][PATCH 1/2] Fix musb_hdrc EP_STATUS_NAME
+
+There is no 'ep3', only 'epX{in,out}':
+root at beagleboard:~# ls /dev/gadget/
+ep10in	 ep11in   ep12in   ep13  ep15	ep1out	ep2out	ep3out	ep4out	ep5out	ep6out	ep7out	ep8out	ep9out
+ep10out  ep11out  ep12out  ep14  ep1in	ep2in	ep3in	ep4in	ep5in	ep6in	ep7in	ep8in	ep9in	musb_hdrc
+
+Tested on OMAP3530 based beagleboard with iPhoto as PTP application on a macbook
+
+Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
+---
+ ptp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ptp.c b/ptp.c
+index edb307f..ec80199 100644
+--- a/ptp.c
++++ b/ptp.c
+@@ -701,7 +701,7 @@ static int autoconfig(void)
+ 		fs_status_desc.bEndpointAddress
+ 			= hs_status_desc.bEndpointAddress
+ 			= USB_DIR_IN | 3;
+-		EP_STATUS_NAME = "ep3";
++		EP_STATUS_NAME = "ep3in";
+ 
+ 	/* Atmel AT91 processors, full speed only */
+ 	} else if (stat(DEVNAME = "at91_udc", &statb) == 0) {
+-- 
+1.6.1
+
diff --git a/recipes/gphoto2/ptp-gadget_git.bb b/recipes/gphoto2/ptp-gadget_git.bb
index edd08cd..376ee21 100644
--- a/recipes/gphoto2/ptp-gadget_git.bb
+++ b/recipes/gphoto2/ptp-gadget_git.bb
@@ -5,10 +5,12 @@ DEPENDS = "virtual/kernel"
 RDEPENDS = "imagemagick"
 
 PV = "1.1"
+PR = "r1"
 PR_append = "+gitr${SRCREV}"
 
 SRCREV = "ef7ef29b5cdcf8630c901362a66905b956242e0d"
-SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git"
+SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git \
+           file://0001-Fix-musb_hdrc-EP_STATUS_NAME.patch;patch=1"
 
 S = "${WORKDIR}/git"