Skip to content

Commit

Permalink
USB: cdc.h: ncm: typo and style fixes
Browse files Browse the repository at this point in the history
Some typos were in the initial commit, make the spelling
according to the spec.

Add some more comments.

Also change constant names according to the style of the rest
of the file

Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Yauheni Kaliuta authored and Greg Kroah-Hartman committed Oct 22, 2010
1 parent c6991b6 commit 1f53c0e
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions include/linux/usb/cdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,13 @@ struct usb_cdc_notification {
/*
* Class Specific structures and constants
*
* CDC NCM parameter structure, CDC NCM subclass 6.2.1
* CDC NCM NTB parameters structure, CDC NCM subclass 6.2.1
*
*/

struct usb_cdc_ncm_ntb_parameter {
struct usb_cdc_ncm_ntb_parameters {
__le16 wLength;
__le16 bmNtbFormatSupported;
__le16 bmNtbFormatsSupported;
__le32 dwNtbInMaxSize;
__le16 wNdpInDivisor;
__le16 wNdpInPayloadRemainder;
Expand All @@ -297,8 +297,8 @@ struct usb_cdc_ncm_ntb_parameter {
* CDC NCM transfer headers, CDC NCM subclass 3.2
*/

#define NCM_NTH16_SIGN 0x484D434E /* NCMH */
#define NCM_NTH32_SIGN 0x686D636E /* ncmh */
#define USB_CDC_NCM_NTH16_SIGN 0x484D434E /* NCMH */
#define USB_CDC_NCM_NTH32_SIGN 0x686D636E /* ncmh */

struct usb_cdc_ncm_nth16 {
__le32 dwSignature;
Expand All @@ -320,23 +320,25 @@ struct usb_cdc_ncm_nth32 {
* CDC NCM datagram pointers, CDC NCM subclass 3.3
*/

#define NCM_NDP16_CRC_SIGN 0x314D434E /* NCM1 */
#define NCM_NDP16_NOCRC_SIGN 0x304D434E /* NCM0 */
#define NCM_NDP32_CRC_SIGN 0x316D636E /* ncm1 */
#define NCM_NDP32_NOCRC_SIGN 0x306D636E /* ncm0 */
#define USB_CDC_NCM_NDP16_CRC_SIGN 0x314D434E /* NCM1 */
#define USB_CDC_NCM_NDP16_NOCRC_SIGN 0x304D434E /* NCM0 */
#define USB_CDC_NCM_NDP32_CRC_SIGN 0x316D636E /* ncm1 */
#define USB_CDC_NCM_NDP32_NOCRC_SIGN 0x306D636E /* ncm0 */

/* 16-bit NCM Datagram Pointer Table */
struct usb_cdc_ncm_ndp16 {
__le32 dwSignature;
__le16 wLength;
__le16 wNextFpIndex;
__u8 data[0];
} __attribute__ ((packed));

/* 32-bit NCM Datagram Pointer Table */
struct usb_cdc_ncm_ndp32 {
__le32 dwSignature;
__le16 wLength;
__le16 wReserved6;
__le32 dwNextFpIndex;
__le32 dwNextNdpIndex;
__le32 dwReserved12;
__u8 data[0];
} __attribute__ ((packed));
Expand Down

0 comments on commit 1f53c0e

Please sign in to comment.