diff options
Diffstat (limited to 'drivers/staging/easycap/easycap.h')
| -rw-r--r-- | drivers/staging/easycap/easycap.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 1f94e2389efc..22b24b6c5a5b 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -62,7 +62,6 @@ #include <linux/uaccess.h> #include <linux/i2c.h> -#include <linux/version.h> #include <linux/workqueue.h> #include <linux/poll.h> #include <linux/mm.h> @@ -70,7 +69,6 @@ #include <linux/delay.h> #include <linux/types.h> -#ifndef CONFIG_EASYCAP_OSS #include <linux/vmalloc.h> #include <linux/sound.h> #include <sound/core.h> @@ -79,16 +77,11 @@ #include <sound/info.h> #include <sound/initval.h> #include <sound/control.h> -#endif /* !CONFIG_EASYCAP_OSS */ #include <media/v4l2-dev.h> #include <media/v4l2-device.h> #include <linux/videodev2.h> #include <linux/soundcard.h> -#ifndef PAGE_SIZE -#error "PAGE_SIZE not defined" -#endif /* PAGE_SIZE */ - /*---------------------------------------------------------------------------*/ /* VENDOR, PRODUCT: Syntek Semiconductor Co., Ltd * @@ -285,8 +278,6 @@ struct inputset { */ /*---------------------------------------------------------------------------*/ struct easycap { -#define TELLTALE "expectedstring" - char telltale[16]; int isdongle; int minor; @@ -420,7 +411,6 @@ struct easycap { * ALSA */ /*---------------------------------------------------------------------------*/ -#ifndef CONFIG_EASYCAP_OSS struct snd_pcm_hardware alsa_hardware; struct snd_card *psnd_card; struct snd_pcm *psnd_pcm; @@ -428,7 +418,6 @@ struct easycap { int dma_fill; int dma_next; int dma_read; -#endif /* !CONFIG_EASYCAP_OSS */ /*---------------------------------------------------------------------------*/ /* * SOUND PROPERTIES @@ -510,12 +499,8 @@ int adjust_volume(struct easycap *, int); * AUDIO FUNCTION PROTOTYPES */ /*---------------------------------------------------------------------------*/ -#ifndef CONFIG_EASYCAP_OSS int easycap_alsa_probe(struct easycap *); void easycap_alsa_complete(struct urb *); -#else /* CONFIG_EASYCAP_OSS */ -void easyoss_complete(struct urb *); -#endif /* !CONFIG_EASYCAP_OSS */ int easycap_sound_setup(struct easycap *); int submit_audio_urbs(struct easycap *); @@ -603,34 +588,6 @@ extern int easycap_debug; #define JOM(n, format, args...) do {} while (0) #endif /* CONFIG_EASYCAP_DEBUG */ -#define MICROSECONDS(X, Y) \ - ((1000000*((long long int)(X.tv_sec - Y.tv_sec))) + \ - (long long int)(X.tv_usec - Y.tv_usec)) - -/*---------------------------------------------------------------------------*/ -/* - * (unsigned char *)P pointer to next byte pair - * (long int *)X pointer to accumulating count - * (long int *)Y pointer to accumulating sum - * (long long int *)Z pointer to accumulating sum of squares - */ -/*---------------------------------------------------------------------------*/ -#define SUMMER(P, X, Y, Z) do { \ - unsigned char *p; \ - unsigned int u0, u1, u2; \ - long int s; \ - p = (unsigned char *)(P); \ - u0 = (unsigned int) (*p); \ - u1 = (unsigned int) (*(p + 1)); \ - u2 = (unsigned int) ((u1 << 8) | u0); \ - if (0x8000 & u2) \ - s = -(long int)(0x7FFF & (~u2)); \ - else \ - s = (long int)(0x7FFF & u2); \ - *((X)) += (long int) 1; \ - *((Y)) += (long int) s; \ - *((Z)) += ((long long int)(s) * (long long int)(s)); \ -} while (0) /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -644,8 +601,5 @@ extern struct easycap_format easycap_format[]; extern struct v4l2_queryctrl easycap_control[]; extern struct usb_driver easycap_usb_driver; extern struct easycap_dongle easycapdc60_dongle[]; -#ifdef CONFIG_EASYCAP_OSS -extern struct usb_class_driver easyoss_class; -#endif /* !CONFIG_EASYCAP_OSS */ #endif /* !__EASYCAP_H__ */ |