[media] em28xx: fix spacing and some comments in em28xx.h
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Mon, 11 Feb 2013 17:01:20 +0000 (14:01 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 4 Mar 2013 17:52:26 +0000 (14:52 -0300)
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/em28xx/em28xx.h

index a3c08ae7ae8e1feb51aa4814d8b2563b9b66a397..4160a2ae1d84f78551c0cd6cfe30f58d7593f83c 100644 (file)
 #include "em28xx-reg.h"
 
 /* Boards supported by driver */
-#define EM2800_BOARD_UNKNOWN                   0
-#define EM2820_BOARD_UNKNOWN                   1
-#define EM2820_BOARD_TERRATEC_CINERGY_250      2
-#define EM2820_BOARD_PINNACLE_USB_2            3
-#define EM2820_BOARD_HAUPPAUGE_WINTV_USB_2      4
-#define EM2820_BOARD_MSI_VOX_USB_2              5
-#define EM2800_BOARD_TERRATEC_CINERGY_200       6
-#define EM2800_BOARD_LEADTEK_WINFAST_USBII      7
-#define EM2800_BOARD_KWORLD_USB2800             8
-#define EM2820_BOARD_PINNACLE_DVC_90           9
-#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900   10
-#define EM2880_BOARD_TERRATEC_HYBRID_XS                11
-#define EM2820_BOARD_KWORLD_PVRTV2800RF                12
-#define EM2880_BOARD_TERRATEC_PRODIGY_XS       13
-#define EM2820_BOARD_PROLINK_PLAYTV_USB2       14
-#define EM2800_BOARD_VGEAR_POCKETTV             15
-#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950   16
-#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO      17
-#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2        18
-#define EM2860_BOARD_SAA711X_REFERENCE_DESIGN  19
-#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600   20
-#define EM2800_BOARD_GRABBEEX_USB2800           21
+#define EM2800_BOARD_UNKNOWN                     0
+#define EM2820_BOARD_UNKNOWN                     1
+#define EM2820_BOARD_TERRATEC_CINERGY_250        2
+#define EM2820_BOARD_PINNACLE_USB_2              3
+#define EM2820_BOARD_HAUPPAUGE_WINTV_USB_2       4
+#define EM2820_BOARD_MSI_VOX_USB_2               5
+#define EM2800_BOARD_TERRATEC_CINERGY_200        6
+#define EM2800_BOARD_LEADTEK_WINFAST_USBII       7
+#define EM2800_BOARD_KWORLD_USB2800              8
+#define EM2820_BOARD_PINNACLE_DVC_90             9
+#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900     10
+#define EM2880_BOARD_TERRATEC_HYBRID_XS                  11
+#define EM2820_BOARD_KWORLD_PVRTV2800RF                  12
+#define EM2880_BOARD_TERRATEC_PRODIGY_XS         13
+#define EM2820_BOARD_PROLINK_PLAYTV_USB2         14
+#define EM2800_BOARD_VGEAR_POCKETTV              15
+#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950     16
+#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO        17
+#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2          18
+#define EM2860_BOARD_SAA711X_REFERENCE_DESIGN    19
+#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600    20
+#define EM2800_BOARD_GRABBEEX_USB2800            21
 #define EM2750_BOARD_UNKNOWN                     22
 #define EM2750_BOARD_DLCW_130                    23
 #define EM2820_BOARD_DLINK_USB_TV                24
 #define EM2882_BOARD_KWORLD_VS_DVBT              54
 #define EM2882_BOARD_TERRATEC_HYBRID_XS                  55
 #define EM2882_BOARD_PINNACLE_HYBRID_PRO_330E    56
-#define EM2883_BOARD_KWORLD_HYBRID_330U                  57
+#define EM2883_BOARD_KWORLD_HYBRID_330U                  57
 #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU     58
 #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850     60
 #define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2    61
 #define EM2820_BOARD_GADMEI_TVR200               62
-#define EM2860_BOARD_KAIOMY_TVNPC_U2              63
-#define EM2860_BOARD_EASYCAP                      64
+#define EM2860_BOARD_KAIOMY_TVNPC_U2             63
+#define EM2860_BOARD_EASYCAP                     64
 #define EM2820_BOARD_IODATA_GVMVP_SZ             65
 #define EM2880_BOARD_EMPIRE_DUAL_TV              66
 #define EM2860_BOARD_TERRATEC_GRABBY             67
 #define EM2860_BOARD_TERRATEC_AV350              68
 #define EM2882_BOARD_KWORLD_ATSC_315U            69
 #define EM2882_BOARD_EVGA_INDTUBE                70
-#define EM2820_BOARD_SILVERCREST_WEBCAM           71
-#define EM2861_BOARD_GADMEI_UTV330PLUS           72
-#define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
+#define EM2820_BOARD_SILVERCREST_WEBCAM                  71
+#define EM2861_BOARD_GADMEI_UTV330PLUS           72
+#define EM2870_BOARD_REDDO_DVB_C_USB_BOX         73
 #define EM2800_BOARD_VC211A                      74
 #define EM2882_BOARD_DIKOM_DK300                 75
 #define EM2870_BOARD_KWORLD_A340                 76
 #define EM2874_BOARD_LEADERSHIP_ISDBT            77
-#define EM28174_BOARD_PCTV_290E                   78
+#define EM28174_BOARD_PCTV_290E                          78
 #define EM2884_BOARD_TERRATEC_H5                 79
-#define EM28174_BOARD_PCTV_460E                   80
+#define EM28174_BOARD_PCTV_460E                          80
 #define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C    81
 #define EM2884_BOARD_CINERGY_HTC_STICK           82
-#define EM2860_BOARD_HT_VIDBOX_NW03              83
-#define EM2874_BOARD_MAXMEDIA_UB425_TC            84
-#define EM2884_BOARD_PCTV_510E                    85
-#define EM2884_BOARD_PCTV_520E                    86
+#define EM2860_BOARD_HT_VIDBOX_NW03              83
+#define EM2874_BOARD_MAXMEDIA_UB425_TC           84
+#define EM2884_BOARD_PCTV_510E                   85
+#define EM2884_BOARD_PCTV_520E                   86
 #define EM2884_BOARD_TERRATEC_HTC_USB_XS         87
 
 /* Limits minimum and default number of buffers */
 
 #define EM28XX_INTERLACED_DEFAULT 1
 
-/*
-#define (use usbview if you want to get the other alternate number infos)
-#define
-#define alternate number 2
-#define                        Endpoint Address: 82
-                       Direction: in
-                       Attribute: 1
-                       Type: Isoc
-                       Max Packet Size: 1448
-                       Interval: 125us
-
-  alternate number 7
-
-                       Endpoint Address: 82
-                       Direction: in
-                       Attribute: 1
-                       Type: Isoc
-                       Max Packet Size: 3072
-                       Interval: 125us
-*/
-
 /* time in msecs to wait for i2c writes to finish */
 #define EM2800_I2C_XFER_TIMEOUT                20
 
@@ -509,8 +488,8 @@ struct em28xx {
        unsigned int is_audio_only:1;
 
        /* Controls audio streaming */
-       struct work_struct wq_trigger;              /* Trigger to start/stop audio for alsa module */
-        atomic_t       stream_started;      /* stream should be running if true */
+       struct work_struct wq_trigger;  /* Trigger to start/stop audio for alsa module */
+       atomic_t       stream_started;  /* stream should be running if true */
 
        struct em28xx_fmt *format;
 
@@ -598,7 +577,7 @@ struct em28xx {
        u8 analog_ep_isoc;      /* address of isoc endpoint for analog */
        u8 analog_ep_bulk;      /* address of bulk endpoint for analog */
        u8 dvb_ep_isoc;         /* address of isoc endpoint for DVB */
-       u8 dvb_ep_bulk;         /* address of bulk endpoint for DVC */
+       u8 dvb_ep_bulk;         /* address of bulk endpoint for DVB */
        int alt;                /* alternate setting */
        int max_pkt_size;       /* max packet size of the selected ep at alt */
        int packet_multiplier;  /* multiplier for wMaxPacketSize, used for