diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2011-02-04 14:47:00 +0200 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2011-02-07 09:51:34 +0200 |
| commit | 6ac4d143a9d23cc06632b16d4194656e8324d2f6 (patch) | |
| tree | 7dd337e662bdd9f078def6b339fe831e9b0941c7 /gisi | |
| parent | 04146d62dfb3c83602c7e103f0a4f5342d1c3e17 (diff) | |
| download | ofono-6ac4d143a9d23cc06632b16d4194656e8324d2f6.tar.bz2 | |
gisi: Refactor netlink
Don't use typedefs for enum types, and move PhoNet device enum over to
common.h.
Diffstat (limited to 'gisi')
| -rw-r--r-- | gisi/common.h | 6 | ||||
| -rw-r--r-- | gisi/netlink.c | 3 | ||||
| -rw-r--r-- | gisi/netlink.h | 18 |
3 files changed, 14 insertions, 13 deletions
diff --git a/gisi/common.h b/gisi/common.h index 83a8cf54..6d639c39 100644 --- a/gisi/common.h +++ b/gisi/common.h @@ -42,6 +42,12 @@ enum message_id { COMMON_MESSAGE = 0xF0, }; +enum GIsiPhonetDevice { + PN_DEV_PC = 0x10, /* PC Suite */ + PN_DEV_HOST = 0x00, /* Host modem */ + PN_DEV_SOS = 0x6C, /* Symbian or Linux */ +}; + enum GIsiMessageType { GISI_MESSAGE_TYPE_REQ, GISI_MESSAGE_TYPE_IND, diff --git a/gisi/netlink.c b/gisi/netlink.c index 07cd6f49..b2180f74 100644 --- a/gisi/netlink.c +++ b/gisi/netlink.c @@ -41,7 +41,6 @@ #include <glib.h> #include "netlink.h" -#include "modem.h" #ifndef ARPHRD_PHONET #define ARPHRD_PHONET (820) @@ -147,7 +146,7 @@ static void pn_netlink_link(GIsiPhonetNetlink *self, struct nlmsghdr *nlh) const struct rtattr *rta; int len; const char *ifname = NULL; - GIsiPhonetLinkState st; + enum GIsiPhonetLinkState st; unsigned interface; ifi = NLMSG_DATA(nlh); diff --git a/gisi/netlink.h b/gisi/netlink.h index 8a8e58b7..36c85b0c 100644 --- a/gisi/netlink.h +++ b/gisi/netlink.h @@ -21,6 +21,7 @@ #include <stdint.h> #include <gisi/modem.h> +#include <gisi/common.h> #ifndef __GISI_PN_NETLINK_H #define __GISI_PN_NETLINK_H @@ -32,20 +33,15 @@ extern "C" { struct _GIsiPhonetNetlink; typedef struct _GIsiPhonetNetlink GIsiPhonetNetlink; -typedef enum { +enum GIsiPhonetLinkState { PN_LINK_REMOVED, PN_LINK_DOWN, - PN_LINK_UP -} GIsiPhonetLinkState; + PN_LINK_UP, +}; -typedef enum { - PN_DEV_PC = 0x10, /* PC Suite */ - PN_DEV_HOST = 0x00, /* Modem */ - PN_DEV_SOS = 0x6C, /* Symbian or Linux */ -} GIsiPhonetDevice; - -typedef void (*GIsiPhonetNetlinkFunc)(GIsiModem *modem, GIsiPhonetLinkState st, - char const *iface, void *data); +typedef void (*GIsiPhonetNetlinkFunc)(GIsiModem *modem, + enum GIsiPhonetLinkState st, + const char *iface, void *data); GIsiPhonetNetlink *g_isi_pn_netlink_by_modem(GIsiModem *modem); |