Commit bc66f155 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] update baycom drivers, remove soundmodem deps

parent 954bd821
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/hdlcdrv.h> #include <linux/hdlcdrv.h>
#include <linux/baycom.h> #include <linux/baycom.h>
#include <linux/soundmodem.h>
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
/* prototypes for ax25_encapsulate and ax25_rebuild_header */ /* prototypes for ax25_encapsulate and ax25_rebuild_header */
#include <net/ax25.h> #include <net/ax25.h>
...@@ -1200,7 +1199,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1200,7 +1199,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
struct baycom_state *bc; struct baycom_state *bc;
struct baycom_ioctl bi; struct baycom_ioctl bi;
struct hdlcdrv_ioctl hi; struct hdlcdrv_ioctl hi;
struct sm_ioctl si;
baycom_paranoia_check(dev, "baycom_ioctl", -EINVAL); baycom_paranoia_check(dev, "baycom_ioctl", -EINVAL);
bc = (struct baycom_state *)dev->priv; bc = (struct baycom_state *)dev->priv;
...@@ -1208,28 +1206,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1208,28 +1206,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
if (get_user(cmd, (int *)ifr->ifr_data)) if (get_user(cmd, (int *)ifr->ifr_data))
return -EFAULT; return -EFAULT;
#ifdef BAYCOM_DEBUG
if (cmd == BAYCOMCTL_GETDEBUG) {
bi.data.dbg.debug1 = bc->ptt_keyed;
bi.data.dbg.debug2 = bc->debug_vals.last_intcnt;
bi.data.dbg.debug3 = bc->debug_vals.last_pllcorr;
bc->debug_vals.last_intcnt = 0;
if (copy_to_user(ifr->ifr_data, &bi, sizeof(bi)))
return -EFAULT;
return 0;
}
if (cmd == SMCTL_GETDEBUG) {
si.data.dbg.int_rate = bc->debug_vals.last_intcnt;
si.data.dbg.mod_cycles = bc->debug_vals.mod_cycles;
si.data.dbg.demod_cycles = bc->debug_vals.demod_cycles;
si.data.dbg.dma_residue = 0;
bc->debug_vals.mod_cycles = bc->debug_vals.demod_cycles = 0;
bc->debug_vals.last_intcnt = 0;
if (copy_to_user(ifr->ifr_data, &si, sizeof(si)))
return -EFAULT;
return 0;
}
#endif /* BAYCOM_DEBUG */
if (copy_from_user(&hi, ifr->ifr_data, sizeof(hi))) if (copy_from_user(&hi, ifr->ifr_data, sizeof(hi)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment