Revert "tools: ffs-test: convert to new descriptor format fixing compilation error"

This reverts commit f2af74123f8c5a735248547f4286a3adc28633c1.

There is a better fix for this build error coming in a following
patch.

Signed-of-by: Felipe Balbi <balbi@ti.com>

diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index ecb3a31f7ca6ae518ca1e97e0440de192dba6b95..2a4b4a72a4f915ee0c0e16db893713bc622359db 100644 (file)
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -53,7 +53,7 @@ struct usb_endpoint_descriptor_no_audio {
  * structure.  Any flags that are not recognised cause the whole block to be
  * rejected with -ENOSYS.
  *
- * Legacy descriptors format (deprecated as of 3.14):
+ * Legacy descriptors format:
  *
  * | off | name      | type         | description                          |
  * |-----+-----------+--------------+--------------------------------------|

diff --git a/tools/usb/Makefile b/tools/usb/Makefile
index d576b3bac3cf9064c591bb8e09a3fb1acddc2b12..acf2165c04e64f8b15e844b787de9f59c324b199 100644 (file)
--- a/tools/usb/Makefile
+++ b/tools/usb/Makefile
@@ -6,11 +6,7 @@ WARNINGS = -Wall -Wextra
 CFLAGS = $(WARNINGS) -g -I../include
 LDFLAGS = $(PTHREAD_LIBS)
 
-all: testusb ffs-test ffs-test-legacy
-
-ffs-test-legacy: ffs-test.c
-       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -DUSE_LEGACY_DESC_HEAD
-
+all: testusb ffs-test
 %: %.c
        $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 

diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index 74b353d9eb5097d8cd7686ace3a6cd6d3666ed67..fe1e66b6ef40bbb1e490edcf2476645d81b66d3f 100644 (file)
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -1,5 +1,5 @@
 /*
- * ffs-test.c -- user mode filesystem api for usb composite function
+ * ffs-test.c.c -- user mode filesystem api for usb composite function
  *
  * Copyright (C) 2010 Samsung Electronics
  *                    Author: Michal Nazarewicz <mina86@mina86.com>
@@ -21,8 +21,6 @@
 
 /* $(CROSS_COMPILE)cc -Wall -Wextra -g -o ffs-test ffs-test.c -lpthread */
 
-/* Uncomment to make the tool use legacy FFS descriptor headers. */
-/* #define USE_LEGACY_DESC_HEAD */
 
 #define _BSD_SOURCE /* for endian.h */
 
@@ -108,15 +106,7 @@ static void _msg(unsigned level, const char *fmt, ...)
 /******************** Descriptors and Strings *******************************/
 
 static const struct {
-       struct {
-               __le32 magic;
-               __le32 length;
-#ifndef USE_LEGACY_DESC_HEAD
-               __le32 flags;
-#endif
-               __le32 fs_count;
-               __le32 hs_count;
-       } __attribute__((packed)) header;
+       struct usb_functionfs_descs_head header;
        struct {
                struct usb_interface_descriptor intf;
                struct usb_endpoint_descriptor_no_audio sink;
@@ -124,13 +114,7 @@ static const struct {
        } __attribute__((packed)) fs_descs, hs_descs;
 } __attribute__((packed)) descriptors = {
        .header = {
-#ifdef USE_LEGACY_DESC_HEAD
                .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC),
-#else
-               .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2),
-               .flags = cpu_to_le32(FUNCTIONFS_HAS_FS_DESC |
-                                    FUNCTIONFS_HAS_HS_DESC),
-#endif
                .length = cpu_to_le32(sizeof descriptors),
                .fs_count = 3,
                .hs_count = 3,