rendered paste body--- setserial-2.17/configure.in.org 2000-01-27 08:03:33.000000000 -0700
+++ setserial-2.17/configure.in 2010-03-10 15:41:08.889997682 -0700
@@ -46,6 +46,6 @@
AC_PROG_CC
AC_PROG_INSTALL
AC_CHECK_TOOL(STRIP, strip, :)
-AC_CHECK_HEADERS(asm/ioctls.h linux/hayesesp.h)
+AC_CHECK_HEADERS(asm/ioctls.h)
AC_OUTPUT(setserial.8 Makefile)
--- setserial-2.17/setserial.c.org 2010-03-10 15:35:17.533148852 -0700
+++ setserial-2.17/setserial.c 2010-03-10 16:20:18.666122552 -0700
@@ -19,9 +19,6 @@
#ifdef HAVE_ASM_IOCTLS_H
#include <asm/ioctls.h>
#endif
-#ifdef HAVE_LINUX_HAYESESP_H
-#include <linux/hayesesp.h>
-#endif
#include <linux/serial.h>
#include "version.h"
@@ -118,14 +115,6 @@
CMD_CONFIG, "autoconfigure",0, 0, 0, 0,
CMD_GETMULTI, "get_multiport",0, 0, 0, 0,
CMD_SETMULTI, "set_multiport",0, 0, 0, 0,
-#ifdef TIOCGHAYESESP
- CMD_RX_TRIG, "rx_trigger", 0, 0, 0, FLAG_NEED_ARG,
- CMD_TX_TRIG, "tx_trigger", 0, 0, 0, FLAG_NEED_ARG,
- CMD_FLOW_OFF, "flow_off", 0, 0, 0, FLAG_NEED_ARG,
- CMD_FLOW_ON, "flow_on", 0, 0, 0, FLAG_NEED_ARG,
- CMD_RX_TMOUT, "rx_timeout", 0, 0, 0, FLAG_NEED_ARG,
- CMD_DMA_CHAN, "dma_channel", 0, 0, 0, FLAG_NEED_ARG,
-#endif
0, 0, 0, 0, 0, 0,
};
@@ -356,62 +345,6 @@
}
#endif
-#ifdef TIOCGHAYESESP
-void print_hayesesp(int fd)
-{
- struct hayes_esp_config esp;
-
- if (ioctl(fd, TIOCGHAYESESP, &esp) < 0)
- return;
-
- printf("\tHayes ESP enhanced mode configuration:\n");
- printf("\t\tRX trigger level: %d, TX trigger level: %d\n",
- (int)esp.rx_trigger, (int)esp.tx_trigger);
- printf("\t\tFlow off level: %d, Flow on level: %d\n",
- (int)esp.flow_off, (int)esp.flow_on);
- printf("\t\tRX timeout: %u, DMA channel: %d\n\n",
- (unsigned int)esp.rx_timeout, (int)esp.dma_channel);
-}
-
-void set_hayesesp(int fd, int cmd, int arg)
-{
- struct hayes_esp_config esp;
-
- if (ioctl(fd, TIOCGHAYESESP, &esp) < 0) {
- printf("\nError: rx_trigger, tx_trigger, flow_off, "
- "flow_on, rx_timeout, and dma_channel\n"
- "are only valid for Hayes ESP ports.\n\n");
- exit(1);
- }
-
- switch (cmd) {
- case CMD_RX_TRIG:
- esp.rx_trigger = arg;
- break;
- case CMD_TX_TRIG:
- esp.tx_trigger = arg;
- break;
- case CMD_FLOW_OFF:
- esp.flow_off = arg;
- break;
- case CMD_FLOW_ON:
- esp.flow_on = arg;
- break;
- case CMD_RX_TMOUT:
- esp.rx_timeout = arg;
- break;
- case CMD_DMA_CHAN:
- esp.dma_channel = arg;
- break;
- }
-
- if (ioctl(fd, TIOCSHAYESESP, &esp) < 0) {
- printf("Cannot set Hayes ESP info\n");
- exit(1);
- }
-}
-#endif
-
void get_serial(char *device)
{
struct serial_struct serinfo;
@@ -453,9 +386,6 @@
print_flags(&serinfo, "\tFlags: ", "");
printf("\n\n");
-#ifdef TIOCGHAYESESP
- print_hayesesp(fd);
-#endif
} else if (verbosity==0) {
if (serinfo.type) {
printf("%s at 0x%.4x (irq = %d) is a %s",
@@ -593,16 +523,6 @@
}
set_multiport(device, fd, &arg);
break;
-#ifdef TIOCGHAYESESP
- case CMD_RX_TRIG:
- case CMD_TX_TRIG:
- case CMD_FLOW_OFF:
- case CMD_FLOW_ON:
- case CMD_RX_TMOUT:
- case CMD_DMA_CHAN:
- set_hayesesp(fd, p->cmd, atonum(*arg++));
- break;
-#endif
default:
fprintf(stderr, "Internal error: unhandled cmd #%d\n", p->cmd);
exit(1);
@@ -692,14 +612,6 @@
fprintf(stderr, "\t get_multiport\tDisplay the multiport configuration\n");
fprintf(stderr, "\t set_multiport\tSet the multiport configuration\n");
fprintf(stderr, "\n");
-#ifdef TIOCGHAYESESP
- fprintf(stderr, "\t* rx_trigger\tSet RX trigger level (ESP-only)\n");
- fprintf(stderr, "\t* tx_trigger\tSet TX trigger level (ESP-only)\n");
- fprintf(stderr, "\t* flow_off\tSet hardware flow off level (ESP-only)\n");
- fprintf(stderr, "\t* flow_on\tSet hardware flow on level (ESP-only)\n");
- fprintf(stderr, "\t* rx_timeout\tSet receive timeout (ESP-only)\n");
- fprintf(stderr, "\t* dma_channel\tSet DMA channel (ESP-only)\n");
-#endif
fprintf(stderr, "\n");
fprintf(stderr, "\t spd_hi\tuse 56kb instead of 38.4kb\n");
fprintf(stderr, "\t spd_vhi\tuse 115kb instead of 38.4kb\n");