Commit e72c39c0 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi

usb: gadget: FunctionFS: create utility file

A header file to be used by f_fs.c and g_ffs.c will be required when
f_fs.c is converted into a module.
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e6f3862f
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/usb/composite.h> #include <linux/usb/composite.h>
#include <linux/usb/functionfs.h> #include <linux/usb/functionfs.h>
#include "u_fs.h"
#define FUNCTIONFS_MAGIC 0xa647361 /* Chosen by a honest dice roll ;) */ #define FUNCTIONFS_MAGIC 0xa647361 /* Chosen by a honest dice roll ;) */
......
...@@ -69,13 +69,6 @@ MODULE_LICENSE("GPL"); ...@@ -69,13 +69,6 @@ MODULE_LICENSE("GPL");
#define GFS_MAX_DEVS 10 #define GFS_MAX_DEVS 10
struct gfs_ffs_obj {
const char *name;
bool mounted;
bool desc_ready;
struct ffs_data *ffs_data;
};
USB_GADGET_COMPOSITE_OPTIONS(); USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor gfs_dev_desc = { static struct usb_device_descriptor gfs_dev_desc = {
...@@ -181,7 +174,7 @@ static DEFINE_MUTEX(gfs_lock); ...@@ -181,7 +174,7 @@ static DEFINE_MUTEX(gfs_lock);
static unsigned int missing_funcs; static unsigned int missing_funcs;
static bool gfs_registered; static bool gfs_registered;
static bool gfs_single_func; static bool gfs_single_func;
static struct gfs_ffs_obj *ffs_tab; static struct ffs_dev *ffs_tab;
static int __init gfs_init(void) static int __init gfs_init(void)
{ {
...@@ -224,7 +217,7 @@ static void __exit gfs_exit(void) ...@@ -224,7 +217,7 @@ static void __exit gfs_exit(void)
} }
module_exit(gfs_exit); module_exit(gfs_exit);
static struct gfs_ffs_obj *gfs_find_dev(const char *dev_name) static struct ffs_dev *gfs_find_dev(const char *dev_name)
{ {
int i; int i;
...@@ -242,7 +235,7 @@ static struct gfs_ffs_obj *gfs_find_dev(const char *dev_name) ...@@ -242,7 +235,7 @@ static struct gfs_ffs_obj *gfs_find_dev(const char *dev_name)
static int functionfs_ready_callback(struct ffs_data *ffs) static int functionfs_ready_callback(struct ffs_data *ffs)
{ {
struct gfs_ffs_obj *ffs_obj; struct ffs_dev *ffs_obj;
int ret; int ret;
ENTER(); ENTER();
...@@ -283,7 +276,7 @@ static int functionfs_ready_callback(struct ffs_data *ffs) ...@@ -283,7 +276,7 @@ static int functionfs_ready_callback(struct ffs_data *ffs)
static void functionfs_closed_callback(struct ffs_data *ffs) static void functionfs_closed_callback(struct ffs_data *ffs)
{ {
struct gfs_ffs_obj *ffs_obj; struct ffs_dev *ffs_obj;
ENTER(); ENTER();
mutex_lock(&gfs_lock); mutex_lock(&gfs_lock);
...@@ -305,7 +298,7 @@ static void functionfs_closed_callback(struct ffs_data *ffs) ...@@ -305,7 +298,7 @@ static void functionfs_closed_callback(struct ffs_data *ffs)
static void *functionfs_acquire_dev_callback(const char *dev_name) static void *functionfs_acquire_dev_callback(const char *dev_name)
{ {
struct gfs_ffs_obj *ffs_dev; struct ffs_dev *ffs_dev;
ENTER(); ENTER();
mutex_lock(&gfs_lock); mutex_lock(&gfs_lock);
...@@ -329,7 +322,7 @@ static void *functionfs_acquire_dev_callback(const char *dev_name) ...@@ -329,7 +322,7 @@ static void *functionfs_acquire_dev_callback(const char *dev_name)
static void functionfs_release_dev_callback(struct ffs_data *ffs_data) static void functionfs_release_dev_callback(struct ffs_data *ffs_data)
{ {
struct gfs_ffs_obj *ffs_dev; struct ffs_dev *ffs_dev;
ENTER(); ENTER();
mutex_lock(&gfs_lock); mutex_lock(&gfs_lock);
......
/*
* u_fs.h
*
* Utility definitions for the FunctionFS
*
* Copyright (c) 2013 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef U_FFS_H
#define U_FFS_H
#include <linux/usb/composite.h>
struct ffs_dev {
const char *name;
bool mounted;
bool desc_ready;
struct ffs_data *ffs_data;
};
#endif /* U_FFS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment