Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ccbc32 authored by Stefan Achatz's avatar Stefan Achatz Committed by Jiri Kosina
Browse files

HID: roccat: change kone_driver_version to kone_abi_version 



Renamed the sysfs attribute kone_driver_version to kone_abi_version and
simplified returned data to integer.

Signed-off-by: default avatarStefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 22d51572

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone

+3 −4
Original line number Diff line number Diff line
@@ -33,11 +33,10 @@ Description: When read, this file returns the raw integer version number of the 
		left. E.g. a returned value of 138 means 1.38

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version

Date:		March 2010

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_abi_version

Date:		May 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns the driver version.

		The format of the string is "v<major>.<minor>.<patchlevel>".

Description:	When read, this file returns the abi version as an integer value.

		This attribute is used by the userland tools to find the sysfs-

		paths of installed kone-mice and determine the capabilites of

		the driver. Versions of this driver for old kernels replace

drivers/hid/hid-roccat-kone.c

+6 −6
Original line number Diff line number Diff line
@@ -621,12 +621,12 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev, 
 * This file is used by userland software to find devices that are handled by

 * this driver. This provides a consistent way for actual and older kernels

 * where this driver replaced usbhid instead of generic-usb.

 * Driver capabilities are determined by version number.

 * Driver capabilities are determined by returned number.

 */

static ssize_t kone_sysfs_show_driver_version(struct device *dev,

static ssize_t kone_sysfs_show_abi_version(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_DRIVER_VERSION "\n");

	return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_ABI_VERSION "\n");

}



/*
@@ -666,8 +666,8 @@ static DEVICE_ATTR(startup_profile, 0660, 
		kone_sysfs_show_startup_profile,

		kone_sysfs_set_startup_profile);



static DEVICE_ATTR(kone_driver_version, 0440,

		kone_sysfs_show_driver_version, NULL);

static DEVICE_ATTR(kone_abi_version, 0440,

		kone_sysfs_show_abi_version, NULL);



static struct attribute *kone_attributes[] = {

		&dev_attr_actual_dpi.attr,
@@ -676,7 +676,7 @@ static struct attribute *kone_attributes[] = { 
		&dev_attr_firmware_version.attr,

		&dev_attr_tcu.attr,

		&dev_attr_startup_profile.attr,

		&dev_attr_kone_driver_version.attr,

		&dev_attr_kone_abi_version.attr,

		NULL

};

drivers/hid/hid-roccat-kone.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <linux/types.h>



#define ROCCAT_KONE_DRIVER_VERSION "v0.3.1"

#define ROCCAT_KONE_ABI_VERSION "1"



#pragma pack(push)

#pragma pack(1)