Changeset 774
- Timestamp:
- 12/01/05 19:56:28 (6 years ago)
- Location:
- trunk/src/ifd
- Files:
-
- 12 edited
-
conf.c (modified) (1 diff)
-
driver.c (modified) (1 diff)
-
ifdhandler.c (modified) (2 diffs)
-
init.c (modified) (1 diff)
-
pcmcia-block.c (modified) (8 diffs)
-
proto-gbp.c (modified) (1 diff)
-
proto-sync.c (modified) (2 diffs)
-
proto-t1.c (modified) (1 diff)
-
sys-null.c (modified) (1 diff)
-
sys-osx.c (modified) (1 diff)
-
sys-solaris.c (modified) (2 diffs)
-
usb-descriptors.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/ifd/conf.c
r683 r774 357 357 return -1; 358 358 359 again:359 again: 360 360 s = (char *)ct_buf_head(&config_buf); 361 361 n = ct_buf_avail(&config_buf); -
trunk/src/ifd/driver.c
r702 r774 175 175 return n; 176 176 } 177 -
trunk/src/ifd/ifdhandler.c
r763 r774 103 103 104 104 /* Initialize IFD library */ 105 if (ifd_init()) 105 if (ifd_init()) 106 106 return 1; 107 107 … … 165 165 static void TERMhandler(int signo) 166 166 { 167 ct_mainloop_leave();167 ct_mainloop_leave(); 168 168 } 169 169 -
trunk/src/ifd/init.c
r770 r774 20 20 /* initialize ltdl */ 21 21 i = lt_dlinit(); 22 if (i != 0) 23 ct_error("lt_dlinit returned %d", i);22 if (i != 0) 23 ct_error("lt_dlinit returned %d", i); 24 24 25 25 /* Register built-in drivers */ -
trunk/src/ifd/pcmcia-block.c
r732 r774 20 20 */ 21 21 static int 22 ifd_pcmcia_block_send(ifd_device_t *dev, const unsigned char *buffer, size_t len) 22 ifd_pcmcia_block_send(ifd_device_t * dev, const unsigned char *buffer, 23 size_t len) 23 24 { 24 size_t total = len;25 int n;25 size_t total = len; 26 int n; 26 27 27 28 while (len) { 28 29 n = write(dev->fd, buffer, len); 29 30 if (n < 0) { 30 ct_error("Error writing to %s: %m", 31 dev->name); 31 ct_error("Error writing to %s: %m", dev->name); 32 32 return -1; 33 33 } … … 40 40 41 41 static int 42 ifd_pcmcia_block_recv(ifd_device_t *dev, unsigned char *buffer, size_t len, long timeout) 42 ifd_pcmcia_block_recv(ifd_device_t * dev, unsigned char *buffer, size_t len, 43 long timeout) 43 44 { 44 struct timeval begin;45 struct timeval begin; 45 46 int n; 46 47 … … 57 58 n = poll(&pfd, 1, wait); 58 59 if (n < 0) { 59 ct_error("%s: error while waiting for input: %m", 60 dev->name); 60 ct_error("%s: error while waiting for input: %m", dev->name); 61 61 return -1; 62 62 } … … 74 74 return n; 75 75 76 timeout:/* Timeouts are a little special; they may happen e.g.77 * when trying to obtain the ATR */76 timeout: /* Timeouts are a little special; they may happen e.g. 77 * when trying to obtain the ATR */ 78 78 if (!ct_config.suppress_errors) 79 79 ct_error("%s: timed out while waiting for input", dev->name); … … 84 84 * Close the device 85 85 */ 86 static void 87 ifd_pcmcia_block_close(ifd_device_t *dev) 86 static void ifd_pcmcia_block_close(ifd_device_t * dev) 88 87 { 89 88 if (dev->fd >= 0) … … 97 96 * Open serial device 98 97 */ 99 ifd_device_t * 100 ifd_open_pcmcia_block(const char *name) 98 ifd_device_t *ifd_open_pcmcia_block(const char *name) 101 99 { 102 ifd_device_t *dev;103 int fd;100 ifd_device_t *dev; 101 int fd; 104 102 105 103 if ((fd = open(name, O_RDWR)) < 0) { … … 113 111 114 112 dev = ifd_device_new(name, &ifd_pcmcia_block_ops, sizeof(*dev)); 115 dev->timeout = 1000; /* acceptable? */113 dev->timeout = 1000; /* acceptable? */ 116 114 dev->type = IFD_DEVICE_TYPE_PCMCIA_BLOCK; 117 115 dev->fd = fd; … … 119 117 return dev; 120 118 } 121 -
trunk/src/ifd/proto-gbp.c
r683 r774 272 272 } 273 273 274 done:274 done: 275 275 return ct_buf_avail(&rbuf); 276 276 277 error:277 error: 278 278 gp->state = DEAD; 279 279 return -1; -
trunk/src/ifd/proto-sync.c
r683 r774 125 125 } 126 126 127 out:127 out: 128 128 if (!res) { 129 129 ifd_protocol_free(p); … … 166 166 return n; 167 167 168 failed:168 failed: 169 169 if (p != NULL) 170 170 ifd_protocol_free(p); -
trunk/src/ifd/proto-t1.c
r663 r774 369 369 } 370 370 371 done:371 done: 372 372 return ct_buf_avail(&rbuf); 373 373 374 error:374 error: 375 375 t1->state = DEAD; 376 376 return -1; -
trunk/src/ifd/sys-null.c
r772 r774 99 99 } 100 100 101 102 101 int ifd_sysdep_usb_open(const char *device, int flags) 103 102 { 104 return -1;103 return -1; 105 104 } 106 105 -
trunk/src/ifd/sys-osx.c
r750 r774 89 89 } 90 90 91 92 91 int ifd_sysdep_usb_open(const char *device, int flags) 93 92 { 94 return -1;93 return -1; 95 94 } 96 95 -
trunk/src/ifd/sys-solaris.c
r683 r774 85 85 char *devstat; 86 86 87 if ((devstat = calloc(1, strlen(name) + 2)) == NULL) {87 if ((devstat = calloc(1, strlen(name) + 2)) == NULL) { 88 88 ct_error("out of memory"); 89 89 return IFD_ERROR_NO_MEMORY; … … 304 304 bytes_to_process = USB_REQUEST_SIZE + 305 305 ((requesttype & USB_EP_DIR_MASK) == USB_EP_DIR_OUT ? len : 0); 306 if ((usb_control_req = calloc(1, bytes_to_process)) == NULL) {306 if ((usb_control_req = calloc(1, bytes_to_process)) == NULL) { 307 307 ct_error("out of memory"); 308 308 return -1; 309 309 } 310 if ((recv_data = calloc(1, len)) == NULL) {310 if ((recv_data = calloc(1, len)) == NULL) { 311 311 ct_error("out of memory"); 312 312 free(usb_control_req); -
trunk/src/ifd/usb-descriptors.c
r677 r774 115 115 while (size > 0) { 116 116 interface->altsetting = (struct ifd_usb_interface_descriptor *) 117 realloc(interface->altsetting,118 sizeof(struct ifd_usb_interface_descriptor)119 * (interface->num_altsetting + 1)120 );117 realloc(interface->altsetting, 118 sizeof(struct ifd_usb_interface_descriptor) 119 * (interface->num_altsetting + 1) 120 ); 121 121 if (!interface->altsetting) { 122 122 ct_error("out of memory");
Note: See TracChangeset
for help on using the changeset viewer.
