Commit c0c502af authored by 's avatar

fixed multiple device opening in mapicombo6drv


git-svn-id: file:///home/svn/mapi/trunk@1499 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent e5555f86
...@@ -93,6 +93,7 @@ int mapidrv_add_device(const char *devname, int file,int devid, global_function_ ...@@ -93,6 +93,7 @@ int mapidrv_add_device(const char *devname, int file,int devid, global_function_
i->file=file; i->file=file;
i->hwinfo.offline=0; i->hwinfo.offline=0;
i->combo6fd = -1; i->combo6fd = -1;
i->sze = NULL;
i->hwinfo.devfd=i->combo6fd; i->hwinfo.devfd=i->combo6fd;
i->hwinfo.gflist=gflist; i->hwinfo.gflist=gflist;
i->hwinfo.pkt_drop=0; i->hwinfo.pkt_drop=0;
...@@ -268,7 +269,7 @@ mapidrv_create_flow (int devid, int fd, char **devtype) ...@@ -268,7 +269,7 @@ mapidrv_create_flow (int devid, int fd, char **devtype)
*devtype=MAPI_DEVICE_SCAMPI; *devtype=MAPI_DEVICE_SCAMPI;
//Open device if it is not already open //Open device if it is not already open
if (i->combo6fd < 0) if (i->sze == NULL)
{ {
if ((i->sze = szedata_open (i->name)) == NULL) { if ((i->sze = szedata_open (i->name)) == NULL) {
fprintf (stderr, "szedata_open(%s): %s\n", i->name, strerror (errno)); fprintf (stderr, "szedata_open(%s): %s\n", i->name, strerror (errno));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment