[Xmblackberry-devel] XmBlackBerry XmBlackBerry.h, 1.40, 1.41 bb_proto.c, 1.55, 1.56 bb_usb.c, 1.151, 1.152

[Rick S. <rw...@us...>]

Update of /cvsroot/xmblackberry/XmBlackBerry
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18061

Modified Files:
	XmBlackBerry.h bb_proto.c bb_usb.c 
Log Message:
Hang on to what Martin thinks is the binary version of the description.


Index: bb_proto.c
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/bb_proto.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** bb_proto.c	9 Jun 2007 15:37:26 -0000	1.55
--- bb_proto.c	5 Dec 2007 22:00:15 -0000	1.56
***************
*** 100,103 ****
--- 100,104 ----
  	dev->next = NULL;
  	dev->pin = (uint32_t)-1;
+ 	dev->series = (uint16_t)-1;
  	dev->version = (uint32_t)-1;
  	dev->baud = 9600;

Index: bb_usb.c
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/bb_usb.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** bb_usb.c	1 Dec 2007 18:10:52 -0000	1.151
--- bb_usb.c	5 Dec 2007 22:00:16 -0000	1.152
***************
*** 866,873 ****
  			}
  			bb->blackberry->desc = strdup((char *)&data[28]);
! 			debug(6, "%s:%s(%d) - %08x \"%s\"\n",
  			    __FILE__, __FUNCTION__, __LINE__,
  			    bb->blackberry->pin,
! 			    bb->blackberry->desc);
  			bb->blackberry->select_mode = select_mode;
  			bb->blackberry->close_socket = close_socket;
--- 866,875 ----
  			}
  			bb->blackberry->desc = strdup((char *)&data[28]);
! 			bb->blackberry->series = data[26] << 8 | data[25];
! 			debug(6, "%s:%s(%d) - %08x \"%s\" 0x%04x\n",
  			    __FILE__, __FUNCTION__, __LINE__,
  			    bb->blackberry->pin,
! 			    bb->blackberry->desc,
! 			    bb->blackberry->series);
  			bb->blackberry->select_mode = select_mode;
  			bb->blackberry->close_socket = close_socket;

Index: XmBlackBerry.h
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/XmBlackBerry.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** XmBlackBerry.h	1 Dec 2007 12:41:55 -0000	1.40
--- XmBlackBerry.h	5 Dec 2007 22:00:12 -0000	1.41
***************
*** 59,62 ****
--- 59,63 ----
                           */
      char *desc; /**< Description from the device */
+     uint16_t series;
  #if 0
      struct command_rec *command_table; /* should be in desktop_t */