retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

merges from KERNEL_2_4 branch

This commit is contained in:
Kai Germaschewski 2001-07-13 09:27:00 +00:00
parent bf859c6ef7
commit de3b81cbce
4 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isdn/Config.in
View File

@ -104,8 +104,8 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
bool ' Gazel cards' CONFIG_HISAX_GAZEL
bool ' HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI
bool ' Winbond W6692 based cards' CONFIG_HISAX_W6692
bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX
# bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
bool ' Am7930' CONFIG_HISAX_AMD7930

5
drivers/isdn/hisax/Makefile
View File

@ -6,7 +6,7 @@ O_TARGET := vmlinux-obj.o
# Objects that export symbols.
export-objs := config.o hfc_usbr.o
export-objs := config.o
# Multipart objects.
@ -15,6 +15,7 @@ hisax-objs := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
lmgr.o q931.o callc.o fsm.o cert.o
# Optional parts of multipart objects.
hisax-objs-$(CONFIG_HISAX_EURO) += l3dss1.o
hisax-objs-$(CONFIG_HISAX_NI1) += l3ni1.o
hisax-objs-$(CONFIG_HISAX_1TR6) += l3_1tr6.o
@ -74,5 +75,3 @@ include $(TOPDIR)/drivers/isdn/Rules.make
hisax.o: $(hisax-objs)
$(LD) -r -o $@ $(hisax-objs)

34
drivers/isdn/isdn_tty.c
View File

@ -1422,8 +1422,7 @@ isdn_tty_get_lsr_info(modem_info * info, uint * value)
status = info->lsr;
restore_flags(flags);
result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
put_user(result, (uint *) value);
return 0;
return put_user(result, (uint *) value);
}
@ -1446,8 +1445,7 @@ isdn_tty_get_modem_info(modem_info * info, uint * value)
| ((status & UART_MSR_RI) ? TIOCM_RNG : 0)
| ((status & UART_MSR_DSR) ? TIOCM_DSR : 0)
| ((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
put_user(result, (uint *) value);
return 0;
return put_user(result, (uint *) value);
}
static int
@ -1456,7 +1454,8 @@ isdn_tty_set_modem_info(modem_info * info, uint cmd, uint * value)
uint arg;
int pre_dtr;
get_user(arg, (uint *) value);
if (get_user(arg, (uint *) value))
return -EFAULT;
switch (cmd) {
case TIOCMBIS:
#ifdef ISDN_DEBUG_MODEM_IOCTL
@ -1524,7 +1523,6 @@ isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
uint cmd, ulong arg)
{
modem_info *info = (modem_info *) tty->driver_data;
int error;
int retval;
if (isdn_tty_paranoia_check(info, tty->device, "isdn_tty_ioctl"))
@ -1554,19 +1552,13 @@ isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCGSOFTCAR\n", info->line);
#endif
error = verify_area(VERIFY_WRITE, (void *) arg, sizeof(long));
if (error)
return error;
put_user(C_CLOCAL(tty) ? 1 : 0, (ulong *) arg);
return 0;
return put_user(C_CLOCAL(tty) ? 1 : 0, (ulong *) arg);
case TIOCSSOFTCAR:
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCSSOFTCAR\n", info->line);
#endif
error = verify_area(VERIFY_READ, (void *) arg, sizeof(long));
if (error)
return error;
get_user(arg, (ulong *) arg);
if (get_user(arg, (ulong *) arg))
return -EFAULT;
tty->termios->c_cflag =
((tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0));
@ -1575,26 +1567,16 @@ isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCMGET\n", info->line);
#endif
error = verify_area(VERIFY_WRITE, (void *) arg, sizeof(uint));
if (error)
return error;
return isdn_tty_get_modem_info(info, (uint *) arg);
case TIOCMBIS:
case TIOCMBIC:
case TIOCMSET:
error = verify_area(VERIFY_READ, (void *) arg, sizeof(uint));
if (error)
return error;
return isdn_tty_set_modem_info(info, cmd, (uint *) arg);
case TIOCSERGETLSR: /* Get line status register */
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "ttyI%d ioctl TIOCSERGETLSR\n", info->line);
#endif
error = verify_area(VERIFY_WRITE, (void *) arg, sizeof(uint));
if (error)
return error;
else
return isdn_tty_get_lsr_info(info, (uint *) arg);
return isdn_tty_get_lsr_info(info, (uint *) arg);
default:
#ifdef ISDN_DEBUG_MODEM_IOCTL
printk(KERN_DEBUG "UNKNOWN ioctl 0x%08x on ttyi%d\n", cmd, info->line);

2
v2.2.20.ctrl
View File

@ -68,4 +68,4 @@
#define in_irq(dummy) (local_irq_count[smp_processor_id()] != 0)
#define PCI_DEVICE_ID_AVM_C2 0x1100
#define PCI_DEVICE_ID_AVM_C2 0x1100