mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/usb/u2f: Declare QOM macros using OBJECT_DECLARE_TYPE()

Browse Source 
hw/usb/u2f.h was added by commit 80e267f1d1 ("hw/usb: Add
U2F key base class"), almost the same time of the automatic
conversion done by commit c821774a3b ("Use OBJECT_DECLARE_TYPE
where posible"). Manually convert to OBJECT_DECLARE_TYPE().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230220150515.32549-9-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-17 14:11:23 +01:00
parent 1fc3efc6dd
commit c3e9090c5e
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/usb/u2f.h
View File

@ -31,22 +31,16 @@
#define U2FHID_PACKET_SIZE 64 #define U2FHID_PACKET_SIZE 64
#define U2FHID_PENDING_IN_NUM 32 #define U2FHID_PENDING_IN_NUM 32
typedef struct U2FKeyState U2FKeyState;
typedef struct U2FKeyInfo U2FKeyInfo; typedef struct U2FKeyInfo U2FKeyInfo;
#define TYPE_U2F_KEY "u2f-key" #define TYPE_U2F_KEY "u2f-key"
#define U2F_KEY(obj) \ OBJECT_DECLARE_TYPE(U2FKeyState, U2FKeyClass, U2F_KEY)
OBJECT_CHECK(U2FKeyState, (obj), TYPE_U2F_KEY)
#define U2F_KEY_CLASS(klass) \
OBJECT_CLASS_CHECK(U2FKeyClass, (klass), TYPE_U2F_KEY)
#define U2F_KEY_GET_CLASS(obj) \
OBJECT_GET_CLASS(U2FKeyClass, (obj), TYPE_U2F_KEY)
/* /*
* Callbacks to be used by the U2F key base device (i.e. hw/u2f.c) * Callbacks to be used by the U2F key base device (i.e. hw/u2f.c)
* to interact with its variants (i.e. hw/u2f-*.c) * to interact with its variants (i.e. hw/u2f-*.c)
*/ */
typedef struct U2FKeyClass { struct U2FKeyClass {
/*< private >*/ /*< private >*/
USBDeviceClass parent_class; USBDeviceClass parent_class;
@ -55,12 +49,12 @@ typedef struct U2FKeyClass {
const uint8_t packet[U2FHID_PACKET_SIZE]); const uint8_t packet[U2FHID_PACKET_SIZE]);
void (*realize)(U2FKeyState *key, Error **errp); void (*realize)(U2FKeyState *key, Error **errp);
void (*unrealize)(U2FKeyState *key); void (*unrealize)(U2FKeyState *key);
} U2FKeyClass; };
/* /*
* State of the U2F key base device (i.e. hw/u2f.c) * State of the U2F key base device (i.e. hw/u2f.c)
*/ */
typedef struct U2FKeyState { struct U2FKeyState {
USBDevice dev; USBDevice dev;
USBEndpoint *ep; USBEndpoint *ep;
uint8_t idle; uint8_t idle;
@ -70,7 +64,7 @@ typedef struct U2FKeyState {
uint8_t pending_in_start; uint8_t pending_in_start;
uint8_t pending_in_end; uint8_t pending_in_end;
uint8_t pending_in_num; uint8_t pending_in_num;
} U2FKeyState; };
/* /*
* API to be used by the U2F key device variants (i.e. hw/u2f-*.c) * API to be used by the U2F key device variants (i.e. hw/u2f-*.c)