Search /dev/ttyUSB%d as well as /dev/usb/ttyUSB%d

[michaelrsweet]

Version: 1.2.5
CUPS.org User: twaugh.redhat

The serial backend needs to search /dev/ttyUSB%d as well as /dev/usb/ttyUSB%d as both have been used at various times. FC6 uses /dev/ttyUSB%d FWIW.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

Gotta love how the kernel developers change things for no good reason...

I committed a slightly different patch (attached)...

[michaelrsweet]

"cups-ttyUSB.patch":

--- cups-1.2.5/backend/serial.c.ttyUSB 2006-10-27 13:01:51.000000000 +0100
+++ cups-1.2.5/backend/serial.c 2006-10-27 13:01:52.000000000 +0100
@@ -769,14 +769,17 @@
}
}

• for (i = 0; i < 16; i ++)
• for (i = 0; i < 2; i ++)
  {
• sprintf(device, "/dev/usb/ttyUSB%d", i);
• if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
• for (j = 0; j < 16; j++)
  {

•  close(fd);
  

•  printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
  

•         device, i + 1);
  

•  sprintf(device, "/dev/%sttyUSB%d", i ? "" : "usb/", j);
  

•  if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
  

•  {
  

•    close(fd);
  

•    printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
  

•           device, j + 1);
  

•  }
  

  }
  }

[michaelrsweet]

"str2061.patch":

Index: serial.c

--- serial.c (revision 6065)
+++ serial.c (working copy)
@@ -778,6 +778,14 @@
printf("serial serial:%s?baud=230400 "Unknown" "USB Serial Port #%d"\n",
device, i + 1);
}
+

• sprintf(device, "/dev/ttyUSB%d", i);
• if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
• {

•  close(fd);
  

•  printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
  

•         device, i + 1);
  

• }
  }

for (i = 0; i < 64; i ++)