From 2632b38ef665a93138dcfba7f0688c03c970d6ce Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Sat, 30 Apr 2011 00:33:33 +0200 Subject: [PATCH] Use stdint types --- include/tag.h | 6 ++++-- include/types.h | 3 --- plugins/nfctype2.c | 2 +- src/adapter.c | 16 ++++++++-------- src/manager.c | 4 ++-- src/near.h | 42 +++++++++++++++++++++--------------------- src/netlink.c | 26 +++++++++++++------------- src/tag.c | 4 ++-- src/target.c | 28 ++++++++++++++-------------- 9 files changed, 65 insertions(+), 66 deletions(-) diff --git a/include/tag.h b/include/tag.h index f74d8a0..b254fcb 100644 --- a/include/tag.h +++ b/include/tag.h @@ -22,6 +22,8 @@ #ifndef __NEAR_TAG_H #define __NEAR_TAG_H +#include + #include #define NEAR_TAG_NFC_TYPE1 0x1 @@ -32,9 +34,9 @@ #define NEAR_TAG_NFC_UNKNOWN 0xff struct near_tag_driver { - near_uint16_t type; + uint16_t type; - int (*read)(guint32 adapter_idx, guint32 target_idx, + int (*read)(uint32_t adapter_idx, uint32_t target_idx, void *buf, size_t length); }; diff --git a/include/types.h b/include/types.h index 09b45ad..bd5b53d 100644 --- a/include/types.h +++ b/include/types.h @@ -31,8 +31,5 @@ #endif typedef int near_bool_t; -typedef unsigned char near_uint8_t; -typedef unsigned short near_uint16_t; -typedef unsigned int near_uint32_t; #endif diff --git a/plugins/nfctype2.c b/plugins/nfctype2.c index 10f7f16..a086a81 100644 --- a/plugins/nfctype2.c +++ b/plugins/nfctype2.c @@ -28,7 +28,7 @@ #include #include -static int nfctype2_read(guint32 adapter_idx, guint32 target_idx, +static int nfctype2_read(uint32_t adapter_idx, uint32_t target_idx, void *buf, size_t length) { return 0; diff --git a/src/adapter.c b/src/adapter.c index 292507d..ba06d9f 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -43,8 +43,8 @@ struct near_adapter { char *path; char *name; - guint32 idx; - guint32 protocols; + uint32_t idx; + uint32_t protocols; near_bool_t powered; near_bool_t polling; @@ -223,8 +223,8 @@ static GDBusSignalTable adapter_signals[] = { { } }; -struct near_adapter * __near_adapter_create(guint32 idx, - const char *name, guint32 protocols) +struct near_adapter * __near_adapter_create(uint32_t idx, + const char *name, uint32_t protocols) { struct near_adapter *adapter; @@ -258,14 +258,14 @@ const char *__near_adapter_get_path(struct near_adapter *adapter) return adapter->path; } -struct near_adapter *__near_adapter_get(guint32 idx) +struct near_adapter *__near_adapter_get(uint32_t idx) { return g_hash_table_lookup(adapter_hash, GINT_TO_POINTER(idx)); } int __near_adapter_add(struct near_adapter *adapter) { - guint32 idx = adapter->idx; + uint32_t idx = adapter->idx; DBG("%s", adapter->path); @@ -294,7 +294,7 @@ void __near_adapter_remove(struct near_adapter *adapter) g_hash_table_remove(adapter_hash, GINT_TO_POINTER(adapter->idx)); } -int __near_adapter_add_target(guint32 idx, struct near_target *target) +int __near_adapter_add_target(uint32_t idx, struct near_target *target) { struct near_adapter *adapter; @@ -310,7 +310,7 @@ int __near_adapter_add_target(guint32 idx, struct near_target *target) return 0; } -int __near_adapter_remove_target(guint32 idx) +int __near_adapter_remove_target(uint32_t idx) { struct near_adapter *adapter; diff --git a/src/manager.c b/src/manager.c index c69be43..08ad4be 100644 --- a/src/manager.c +++ b/src/manager.c @@ -67,7 +67,7 @@ static DBusMessage *set_property(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -int __near_manager_adapter_add(guint32 idx, const char *name, guint32 protocols) +int __near_manager_adapter_add(uint32_t idx, const char *name, uint32_t protocols) { struct near_adapter *adapter; const char *path; @@ -102,7 +102,7 @@ int __near_manager_adapter_add(guint32 idx, const char *name, guint32 protocols) return err; } -void __near_manager_adapter_remove(guint32 idx) +void __near_manager_adapter_remove(uint32_t idx) { struct near_adapter *adapter; const char *path; diff --git a/src/near.h b/src/near.h index 3347ec7..bb15749 100644 --- a/src/near.h +++ b/src/near.h @@ -59,20 +59,20 @@ DBusMessage *__near_error_operation_timeout(DBusMessage *msg); DBusMessage *__near_error_invalid_service(DBusMessage *msg); DBusMessage *__near_error_invalid_property(DBusMessage *msg); -int __near_manager_adapter_add(guint32 idx, const char *name, guint32 protocols); -void __near_manager_adapter_remove(guint32 idx); +int __near_manager_adapter_add(uint32_t idx, const char *name, uint32_t protocols); +void __near_manager_adapter_remove(uint32_t idx); int __near_manager_init(DBusConnection *conn); void __near_manager_cleanup(void); -struct near_adapter * __near_adapter_create(guint32 idx, - const char *name, guint32 protocols); +struct near_adapter * __near_adapter_create(uint32_t idx, + const char *name, uint32_t protocols); void __near_adapter_destroy(struct near_adapter *adapter); const char *__near_adapter_get_path(struct near_adapter *adapter); -struct near_adapter *__near_adapter_get(guint32 idx); +struct near_adapter *__near_adapter_get(uint32_t idx); int __near_adapter_add(struct near_adapter *adapter); void __near_adapter_remove(struct near_adapter *adapter); -int __near_adapter_add_target(guint32 idx, struct near_target *target); -int __near_adapter_remove_target(guint32 idx); +int __near_adapter_add_target(uint32_t idx, struct near_target *target); +int __near_adapter_remove_target(uint32_t idx); void __near_adapter_list(DBusMessageIter *iter, void *user_data); int __near_adapter_connect(uint32_t idx); int __near_adapter_disconnect(uint32_t idx); @@ -85,14 +85,14 @@ enum near_target_type { }; const char *__near_target_get_path(struct near_target *target); -near_uint16_t __near_target_get_tag_type(struct near_target *target); -guint32 __near_target_get_idx(struct near_target *target); -guint32 __near_target_get_adapter_idx(struct near_target *target); -guint32 __near_target_get_protocols(struct near_target *target); -int __near_target_add(guint32 adapter_idx, guint32 target_idx, - guint32 protocols, enum near_target_type type, - near_uint16_t sens_res, near_uint8_t sel_res); -void __near_target_remove(guint32 target_idx); +uint16_t __near_target_get_tag_type(struct near_target *target); +uint32_t __near_target_get_idx(struct near_target *target); +uint32_t __near_target_get_adapter_idx(struct near_target *target); +uint32_t __near_target_get_protocols(struct near_target *target); +int __near_target_add(uint32_t adapter_idx, uint32_t target_idx, + uint32_t protocols, enum near_target_type type, + uint16_t sens_res, uint8_t sel_res); +void __near_target_remove(uint32_t target_idx); int __near_target_init(void); void __near_target_cleanup(void); @@ -101,13 +101,13 @@ void __near_target_cleanup(void); int __near_tag_read(struct near_target *target, void *buf, size_t length); int __near_netlink_get_adapters(void); -int __near_netlink_start_poll(int idx, guint32 protocols); +int __near_netlink_start_poll(int idx, uint32_t protocols); int __near_netlink_stop_poll(int idx); -int __near_netlink_activate_target(near_uint32_t adapter_idx, - near_uint32_t target_idx, - near_uint32_t protocol); -int __near_netlink_deactivate_target(near_uint32_t adapter_idx, - near_uint32_t target_idx); +int __near_netlink_activate_target(uint32_t adapter_idx, + uint32_t target_idx, + uint32_t protocol); +int __near_netlink_deactivate_target(uint32_t adapter_idx, + uint32_t target_idx); int __near_netlink_init(void); void __near_netlink_cleanup(void); diff --git a/src/netlink.c b/src/netlink.c index 77d1fdf..2f0217d 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -178,7 +178,7 @@ out: return err; } -int __near_netlink_start_poll(int idx, guint32 protocols) +int __near_netlink_start_poll(int idx, uint32_t protocols) { struct nl_msg *msg; void *hdr; @@ -242,9 +242,9 @@ nla_put_failure: return err; } -int __near_netlink_activate_target(near_uint32_t adapter_idx, - near_uint32_t target_idx, - near_uint32_t protocol) +int __near_netlink_activate_target(uint32_t adapter_idx, + uint32_t target_idx, + uint32_t protocol) { struct nl_msg *msg; void *hdr; @@ -278,8 +278,8 @@ nla_put_failure: return err; } -int __near_netlink_deactivate_target(near_uint32_t adapter_idx, - near_uint32_t target_idx) +int __near_netlink_deactivate_target(uint32_t adapter_idx, + uint32_t target_idx) { struct nl_msg *msg; void *hdr; @@ -322,7 +322,7 @@ static int no_seq_check(struct nl_msg *n, void *arg) static int nfc_netlink_event_adapter(struct genlmsghdr *gnlh, near_bool_t add) { struct nlattr *attrs[NFC_ATTR_MAX + 1]; - guint32 idx; + uint32_t idx; DBG(""); @@ -344,7 +344,7 @@ static int nfc_netlink_event_adapter(struct genlmsghdr *gnlh, near_bool_t add) if (add == TRUE) { char *name; - guint32 protocols; + uint32_t protocols; name = nla_get_string(attrs[NFC_ATTR_DEVICE_NAME]); protocols = nla_get_u32(attrs[NFC_ATTR_PROTOCOLS]); @@ -362,7 +362,7 @@ static int nfc_netlink_event_targets(struct genlmsghdr *gnlh) struct nlattr *attr[NFC_ATTR_MAX + 1]; struct nlattr *attr_nest[NFC_TARGET_ATTR_MAX + 1]; struct nlattr *attr_tgt; - guint32 adapter_idx; + uint32_t adapter_idx; int rem; DBG(""); @@ -380,10 +380,10 @@ static int nfc_netlink_event_targets(struct genlmsghdr *gnlh) attr_tgt = nla_data(attr[NFC_ATTR_TARGETS]); rem = nla_len(attr[NFC_ATTR_TARGETS]); nla_for_each_nested(attr_tgt, attr[NFC_ATTR_TARGETS], rem) { - guint32 target_idx; - guint32 protocols; - near_uint16_t sens_res = 0; - near_uint8_t sel_res = 0; + uint32_t target_idx; + uint32_t protocols; + uint16_t sens_res = 0; + uint8_t sel_res = 0; nla_parse(attr_nest, NFC_TARGET_ATTR_MAX, nla_data(attr_tgt), nla_len(attr_tgt), NULL); diff --git a/src/tag.c b/src/tag.c index a644b50..0ae374f 100644 --- a/src/tag.c +++ b/src/tag.c @@ -57,7 +57,7 @@ void near_tag_driver_unregister(struct near_tag_driver *driver) int __near_tag_read(struct near_target *target, void *buf, size_t length) { GList *list; - near_uint16_t type; + uint16_t type; DBG(""); @@ -69,7 +69,7 @@ int __near_tag_read(struct near_target *target, void *buf, size_t length) struct near_tag_driver *driver = list->data; if (driver->type & type) { - guint32 adapter_idx, target_idx; + uint32_t adapter_idx, target_idx; target_idx = __near_target_get_idx(target); adapter_idx = __near_target_get_adapter_idx(target); diff --git a/src/target.c b/src/target.c index 7ebf55c..49f7a69 100644 --- a/src/target.c +++ b/src/target.c @@ -38,11 +38,11 @@ struct near_target { char *path; - guint32 idx; - guint32 adapter_idx; - guint32 protocols; + uint32_t idx; + uint32_t adapter_idx; + uint32_t protocols; enum near_target_type type; - near_uint16_t tag_type; + uint16_t tag_type; }; static DBusConnection *connection = NULL; @@ -68,22 +68,22 @@ const char *__near_target_get_path(struct near_target *target) return target->path; } -near_uint16_t __near_target_get_tag_type(struct near_target *target) +uint16_t __near_target_get_tag_type(struct near_target *target) { return target->tag_type; } -guint32 __near_target_get_idx(struct near_target *target) +uint32_t __near_target_get_idx(struct near_target *target) { return target->idx; } -guint32 __near_target_get_adapter_idx(struct near_target *target) +uint32_t __near_target_get_adapter_idx(struct near_target *target) { return target->adapter_idx; } -guint32 __near_target_get_protocols(struct near_target *target) +uint32_t __near_target_get_protocols(struct near_target *target) { return target->protocols; } @@ -252,7 +252,7 @@ static GDBusSignalTable target_signals[] = { #define NFC_TAG_A_SEL_PROT(sel_res) (((sel_res) & 0x60) >> 5) static void find_tag_type(struct near_target *target, - near_uint16_t sens_res, near_uint8_t sel_res) + uint16_t sens_res, uint8_t sel_res) { DBG("protocols 0x%x sens_res 0x%x sel_res 0x%x", target->protocols, sens_res, sel_res); @@ -263,7 +263,7 @@ static void find_tag_type(struct near_target *target, } if (target->protocols & NFC_TAG_A) { - near_uint8_t proto = NFC_TAG_A_SEL_PROT(sel_res); + uint8_t proto = NFC_TAG_A_SEL_PROT(sel_res); DBG("proto 0x%x", proto); @@ -290,9 +290,9 @@ static void find_tag_type(struct near_target *target, DBG("tag type 0x%x", target->tag_type); } -int __near_target_add(guint32 adapter_idx, guint32 target_idx, - guint32 protocols, enum near_target_type type, - near_uint16_t sens_res, near_uint8_t sel_res) +int __near_target_add(uint32_t adapter_idx, uint32_t target_idx, + uint32_t protocols, enum near_target_type type, + uint16_t sens_res, uint8_t sel_res) { struct near_target *target; @@ -329,7 +329,7 @@ int __near_target_add(guint32 adapter_idx, guint32 target_idx, return __near_adapter_add_target(adapter_idx, target); } -void __near_target_remove(guint32 target_idx) +void __near_target_remove(uint32_t target_idx) { struct near_target *target; -- 2.7.4