Date: Sun, 28 Jan 2007 22:47:21 +0900 (JST) From: mistral@imasy.or.jp To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108473: update port: devel/libpasori: support RC-S310 Message-ID: <200701281347.l0SDlL2m024805@sachiko.yamayuri.org> Resent-Message-ID: <200701281350.l0SDoDkC051770@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108473
>Category: ports
>Synopsis: update port: devel/libpasori: support RC-S310
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 28 13:50:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Yoshihiko Sarumaru
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD sachiko.yamayuri.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #2: Tue Jan 16 02:03:05 JST 2007 root@sachiko.yamayuri.org:/usr/obj/usr/src/sys/VGN-TX92S i386
>Description:
This PR updates libpasori to detect RC-S310 automatically.
This PR also introduces dynamic link library.
>How-To-Repeat:
>Fix:
diff -ur libpasori.orig/files/Makefile.lib libpasori/files/Makefile.lib
--- libpasori.orig/files/Makefile.lib Sun Jan 21 22:39:26 2007
+++ libpasori/files/Makefile.lib Fri Jan 26 23:34:33 2007
@@ -11,6 +11,7 @@
LIBDIR= ${LOCALBASE}/lib
INCLUDEDIR= ${LOCALBASE}/include
NO_PROFILE=
+SHLIB_MAJOR= 1
CFLAGS+= -D__LIBPASORI_WITH_BSDUGEN
CFLAGS+= -Wall -W
diff -ur libpasori.orig/files/patch-libpasori_com_bsdugen.c libpasori/files/patch-libpasori_com_bsdugen.c
--- libpasori.orig/files/patch-libpasori_com_bsdugen.c Sun Jan 21 22:39:26 2007
+++ libpasori/files/patch-libpasori_com_bsdugen.c Fri Jan 26 23:35:28 2007
@@ -1,6 +1,6 @@
--- src/libpasori_com_bsdugen.c.orig Mon Mar 20 09:12:58 2006
-+++ src/libpasori_com_bsdugen.c Sat Jan 20 23:13:12 2007
-@@ -6,7 +6,16 @@
++++ src/libpasori_com_bsdugen.c Fri Jan 26 23:25:58 2007
+@@ -6,7 +6,17 @@
#include <sys/ioctl.h>
#include <errno.h>
@@ -13,11 +13,12 @@
+#include "libpasori.h"
+
+#define VENDOR_SONY 0x054c
++#define PRODUCT_RC_S310 0x006c
+#define PRODUCT_RC_S320 0x01bb
void dbg_dump(uint8* d,int size){
int i;
-@@ -16,25 +25,86 @@
+@@ -16,25 +26,88 @@
Log("\n");
}
@@ -37,7 +38,9 @@
+ di.udi_addr = devnum;
+ if (ioctl(busfd, USB_DEVICEINFO, &di) != -1) {
+ if ((di.udi_vendorNo == VENDOR_SONY) &&
-+ (di.udi_productNo == PRODUCT_RC_S320)) {
++ ((di.udi_productNo == PRODUCT_RC_S310) ||
++ (di.udi_productNo == PRODUCT_RC_S320))) {
++
+ int i;
+ for (i=0; i<USB_MAX_DEVNAMES; i++) {
+ if (strncmp(di.udi_devnames[i], "ugen", 4) == 0) {
@@ -114,7 +117,7 @@
if( (pp->fd_cntl < 0) || (pp->fd_intr < 0) ){
Log("error opening pasori.%d %d",pp->fd_cntl,pp->fd_intr);
close(pp->fd_cntl);
-@@ -47,7 +117,6 @@
+@@ -47,7 +120,6 @@
int pasori_send(pasori* pp,uint8 *cmd,uint8 size,int timeout){
struct usb_ctl_request req;
@@ -122,7 +125,7 @@
uint8 resp[256];
signed int i;
int t;
-@@ -90,11 +159,12 @@
+@@ -90,11 +162,12 @@
int pasori_recv(pasori* pp,uint8* buf,uint8 bufsize,int timeout){
signed int i;
int state;
@@ -137,7 +140,7 @@
uint8 resp;
state = STATE_UNKNOWN;
-@@ -156,5 +226,7 @@
+@@ -156,5 +229,7 @@
void pasori_close(pasori* p){
close(p->fd_intr);
close(p->fd_cntl);
Only in libpasori: work
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701281347.l0SDlL2m024805>