Attachment #91441 for bug #128776

View | Details | Raw Unified | Return to bug 128776
Collapse All | Expand All




USE_GMAKE=		yes
USE_LDCONFIG=		yes
GNU_CONFIGURE=		yes
CONFIGURE_ARGS+=	--program-transform-name=""

OPTIONS=	LIBUSB "Enable OBEX over USB" no

post-patch:
	@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
		${WRKSRC}/Makefile.in

.include <bsd.port.pre.mk>

.if defined(WITH_LIBUSB)
LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
CONFIGURE_ARGS+=--enable-usb
CFLAGS+=-I${PREFIX}/include
.else
CONFIGURE_ARGS+=--disable-usb
.endif

.include <bsd.port.post.mk>




--- lib/usbobex.c	2006-01-18 13:59:15.000000000 +0100
+++ /lib/usbobex.c	2008-11-11 04:45:17.000000000 +0100
@@ -331,27 +331,10 @@
 
 	DEBUG(4, "\n");
 
-	self->trans.self.usb.dev_control = usb_open(self->trans.self.usb.device);
 	self->trans.self.usb.dev_data = usb_open(self->trans.self.usb.device);
 
-	ret = usb_set_configuration(self->trans.self.usb.dev_control, self->trans.self.usb.configuration);
-	if (ret < 0) {
-		DEBUG(4, "Can't set configuration %d", ret);
-	}
-
-	ret = usb_claim_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
-	if (ret < 0) {
-		DEBUG(4, "Can't claim control interface %d", ret);
-		goto err1;
-	}
-
-	ret = usb_set_altinterface(self->trans.self.usb.dev_control, self->trans.self.usb.control_setting);
-	if (ret < 0) {
-		DEBUG(4, "Can't set control setting %d", ret);
-		goto err2;
-	}
-
 	ret = usb_claim_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
+
 	if (ret < 0) {
 		DEBUG(4, "Can't claim data interface %d", ret);
 		goto err2;
@@ -369,10 +352,8 @@
 err3:
 	usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);	
 err2:
-	usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
 err1:
 	usb_close(self->trans.self.usb.dev_data);
-	usb_close(self->trans.self.usb.dev_control);
 	return ret;
 
 #endif /* _WIN32 */
@@ -391,21 +372,18 @@
 		return 0;
 #ifndef _WIN32
 	DEBUG(4, "\n");
+
+	usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_read);
+	usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_write);
 	ret = usb_set_altinterface(self->trans.self.usb.dev_data, self->trans.self.usb.data_idle_setting);
 	if (ret < 0)
 		DEBUG(4, "Can't set data idle setting %d", ret);
 	ret = usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
 	if (ret < 0) 
 		DEBUG(4, "Can't release data interface %d", ret);
-	ret = usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
-	if (ret < 0) 
-		DEBUG(4, "Can't release control interface %d", ret);
 	ret = usb_close(self->trans.self.usb.dev_data);
 	if (ret < 0)
 		DEBUG(4, "Can't close data interface %d", ret);
-	ret = usb_close(self->trans.self.usb.dev_control);
-	if (ret < 0)
-		DEBUG(4, "Can't close control interface %d", ret);
 #endif /* _WIN32 */
 	return ret;	
 }

Return to bug 128776

Lines 19-29 Link Here

(-)/usr/home/samm/openobex/Makefile (-3 / +14 lines)
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS+= --program-transform-name="" \	22	CONFIGURE_ARGS+= --program-transform-name=""
23	--disable-usb	23
		24	OPTIONS= LIBUSB "Enable OBEX over USB" no
24		25
25	post-patch:	26	post-patch:
26	@ ${REINPLACE_CMD} -e "s\|pkgconfigdir =.*\|pkgconfigdir = ${PREFIX}/libdata/pkgconfig\|g" \	27	@ ${REINPLACE_CMD} -e "s\|pkgconfigdir =.*\|pkgconfigdir = ${PREFIX}/libdata/pkgconfig\|g" \
27	${WRKSRC}/Makefile.in	28	${WRKSRC}/Makefile.in
28		29
29	.include <bsd.port.mk>	30	.include <bsd.port.pre.mk>
		31
		32	.if defined(WITH_LIBUSB)
		33	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
		34	CONFIGURE_ARGS+=--enable-usb
		35	CFLAGS+=-I${PREFIX}/include
		36	.else
		37	CONFIGURE_ARGS+=--disable-usb
		38	.endif
		39
		40	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/home/samm/openobex/files/patch-usbobex.c (+67 lines)
		1	--- lib/usbobex.c 2006-01-18 13:59:15.000000000 +0100
		2	+++ /lib/usbobex.c 2008-11-11 04:45:17.000000000 +0100
		3	@@ -331,27 +331,10 @@
		4
		5	DEBUG(4, "\n");
		6
		7	- self->trans.self.usb.dev_control = usb_open(self->trans.self.usb.device);
		8	self->trans.self.usb.dev_data = usb_open(self->trans.self.usb.device);
		9
		10	- ret = usb_set_configuration(self->trans.self.usb.dev_control, self->trans.self.usb.configuration);
		11	- if (ret < 0) {
		12	- DEBUG(4, "Can't set configuration %d", ret);
		13	- }
		14	-
		15	- ret = usb_claim_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
		16	- if (ret < 0) {
		17	- DEBUG(4, "Can't claim control interface %d", ret);
		18	- goto err1;
		19	- }
		20	-
		21	- ret = usb_set_altinterface(self->trans.self.usb.dev_control, self->trans.self.usb.control_setting);
		22	- if (ret < 0) {
		23	- DEBUG(4, "Can't set control setting %d", ret);
		24	- goto err2;
		25	- }
		26	-
		27	ret = usb_claim_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
		28	+
		29	if (ret < 0) {
		30	DEBUG(4, "Can't claim data interface %d", ret);
		31	goto err2;
		32	@@ -369,10 +352,8 @@
		33	err3:
		34	usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
		35	err2:
		36	- usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
		37	err1:
		38	usb_close(self->trans.self.usb.dev_data);
		39	- usb_close(self->trans.self.usb.dev_control);
		40	return ret;
		41
		42	#endif /* _WIN32 */
		43	@@ -391,21 +372,18 @@
		44	return 0;
		45	#ifndef _WIN32
		46	DEBUG(4, "\n");
		47	+
		48	+ usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_read);
		49	+ usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_write);
		50	ret = usb_set_altinterface(self->trans.self.usb.dev_data, self->trans.self.usb.data_idle_setting);
		51	if (ret < 0)
		52	DEBUG(4, "Can't set data idle setting %d", ret);
		53	ret = usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
		54	if (ret < 0)
		55	DEBUG(4, "Can't release data interface %d", ret);
		56	- ret = usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
		57	- if (ret < 0)
		58	- DEBUG(4, "Can't release control interface %d", ret);
		59	ret = usb_close(self->trans.self.usb.dev_data);
		60	if (ret < 0)
		61	DEBUG(4, "Can't close data interface %d", ret);
		62	- ret = usb_close(self->trans.self.usb.dev_control);
		63	- if (ret < 0)
		64	- DEBUG(4, "Can't close control interface %d", ret);
65	#endif /* _WIN32 */
66	return ret;
67	}