Merge "usb: gadget: ccid: Fix data types of header structures" · b35f50a370 - evie/android_kernel_oneplus_msm8998 - Gay Catgirls Forgejo: gay catgirls having sex

evie/android_kernel_oneplus_msm8998

Merge "usb: gadget: ccid: Fix data types of header structures"

This commit is contained in:

Linux Build Service Account

2017-04-14 07:29:57 -07:00

• committed by

Gerrit - the friendly Code Review server

parent 83a539d288 741ee54947

commit b35f50a370

2 changed files with 40 additions and 40 deletions

									
										36

drivers/usb/gadget/function/f_ccid.h
									
										View file
										
				@ -55,29 +55,29 @@

				#define CCID_READ_DTR		_IOR('C', 3, int)

				struct usb_ccid_notification {

					unsigned char buf[4];

					__u8 buf[4];

				} __packed;

				struct ccid_bulk_in_header {

					unsigned char bMessageType;

					unsigned long wLength;

					unsigned char bSlot;

					unsigned char bSeq;

					unsigned char bStatus;

					unsigned char bError;

					unsigned char bSpecific;

					unsigned char abData[ABDATA_SIZE];

					unsigned char bSizeToSend;

					__u8 bMessageType;

					__u32 wLength;

					__u8 bSlot;

					__u8 bSeq;

					__u8 bStatus;

					__u8 bError;

					__u8 bSpecific;

					__u8 abData[ABDATA_SIZE];

					__u8 bSizeToSend;

				} __packed;

				struct ccid_bulk_out_header {

					unsigned char bMessageType;

					unsigned long wLength;

					unsigned char bSlot;

					unsigned char bSeq;

					unsigned char bSpecific_0;

					unsigned char bSpecific_1;

					unsigned char bSpecific_2;

					unsigned char APDU[ABDATA_SIZE];

					__u8 bMessageType;

					__u32 wLength;

					__u8 bSlot;

					__u8 bSeq;

					__u8 bSpecific_0;

					__u8 bSpecific_1;

					__u8 bSpecific_2;

					__u8 APDU[ABDATA_SIZE];

				} __packed;

				#endif

									
										44

include/linux/usb/ccid_desc.h
									
										View file
										
				@ -86,27 +86,27 @@

				 * Table 5.1-1 Smart Card Device Class descriptors

				 */

				struct usb_ccid_class_descriptor {

					unsigned char  bLength;

					unsigned char  bDescriptorType;

					unsigned short bcdCCID;

					unsigned char  bMaxSlotIndex;

					unsigned char  bVoltageSupport;

					unsigned long  dwProtocols;

					unsigned long  dwDefaultClock;

					unsigned long  dwMaximumClock;

					unsigned char  bNumClockSupported;

					unsigned long  dwDataRate;

					unsigned long  dwMaxDataRate;

					unsigned char  bNumDataRatesSupported;

					unsigned long  dwMaxIFSD;

					unsigned long  dwSynchProtocols;

					unsigned long  dwMechanical;

					unsigned long  dwFeatures;

					unsigned long  dwMaxCCIDMessageLength;

					unsigned char  bClassGetResponse;

					unsigned char  bClassEnvelope;

					unsigned short wLcdLayout;

					unsigned char  bPINSupport;

					unsigned char  bMaxCCIDBusySlots;

					__u8  bLength;

					__u8  bDescriptorType;

					__u16 bcdCCID;

					__u8  bMaxSlotIndex;

					__u8  bVoltageSupport;

					__u32  dwProtocols;

					__u32  dwDefaultClock;

					__u32  dwMaximumClock;

					__u8  bNumClockSupported;

					__u32  dwDataRate;

					__u32  dwMaxDataRate;

					__u8  bNumDataRatesSupported;

					__u32  dwMaxIFSD;

					__u32  dwSynchProtocols;

					__u32  dwMechanical;

					__u32  dwFeatures;

					__u32  dwMaxCCIDMessageLength;

					__u8  bClassGetResponse;

					__u8  bClassEnvelope;

					__u16 wLcdLayout;

					__u8  bPINSupport;

					__u8  bMaxCCIDBusySlots;

				} __packed;

				#endif