Changeset 389 for branches/merlin
- Timestamp:
- 09/04/09 10:51:34 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/src/sharing/serial.c
r294 r389 890 890 } 891 891 892 static int init_sharing_serial_device(char *device)892 static int sharing_serial_init_device(char *device) 893 893 { 894 894 int fd; … … 933 933 client[cs_idx].usr[0] = '\0'; 934 934 client[cs_idx].login = time((time_t *) 0); 935 if ((pfd = init_sharing_serial_device(sharing_serial_device))) {935 if ((pfd = sharing_serial_init_device(sharing_serial_device))) { 936 936 sharing_serial_server(); 937 937 } else { … … 944 944 } 945 945 946 static void init_sharing_serial(int idx)946 static void sharing_serial_init(int idx) 947 947 { 948 948 char *p; … … 965 965 if (!sharing_serial_parse_url(reader[ridx].device)) 966 966 cs_exit(1); 967 pfd = init_sharing_serial_device(sharing_serial_device);967 pfd = sharing_serial_init_device(sharing_serial_device); 968 968 969 969 return ((pfd > 0) ? 0 : 1); … … 1066 1066 ph->multi = 1; 1067 1067 ph->watchdog = 0; 1068 ph->s_handler = init_sharing_serial;1068 ph->s_handler = sharing_serial_init; 1069 1069 ph->recv = sharing_serial_recv; 1070 1070 ph->send_dcw = sharing_serial_send_dcw;
Note:
See TracChangeset
for help on using the changeset viewer.