diff options
Diffstat (limited to 'include/dahdi')
| -rw-r--r-- | include/dahdi/kernel.h | 10 | ||||
| -rw-r--r-- | include/dahdi/user.h | 13 |
2 files changed, 10 insertions, 13 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 0731056..6058779 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -85,6 +85,12 @@ #endif #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) +#define dev_name(dev) (dev)->bus_id +#define dev_set_name(dev, format, ...) \ + snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__); +#endif + /*! Default chunk size for conferences and such -- static right now, might make variable sometime. 8 samples = 1 ms = most frequent service interval possible for a USB device */ @@ -1166,4 +1172,8 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss) #define kzalloc(a, b) kcalloc(1, a, b) #endif +#ifndef DMA_BIT_MASK +#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) +#endif + #endif /* _DAHDI_KERNEL_H */ diff --git a/include/dahdi/user.h b/include/dahdi/user.h index 5c7121a..1d0570a 100644 --- a/include/dahdi/user.h +++ b/include/dahdi/user.h @@ -1027,19 +1027,6 @@ struct dahdi_vmwi_info { #define DAHDI_ECHOCANCEL_FAX_MODE _IOW(DAHDI_CODE, 102, int) -struct torisa_debug { - unsigned int txerrors; - unsigned int irqcount; - unsigned int taskletsched; - unsigned int taskletrun; - unsigned int taskletexec; - int span1flags; - int span2flags; -}; - -/* Special torisa ioctl */ -#define TORISA_GETDEBUG _IOW(DAHDI_CODE, 60, struct torisa_debug) - /* Get current status IOCTL */ /* Defines for Radio Status (dahdi_radio_stat.radstat) bits */ |