mirror of git://git.sysmocom.de/ofono
gisi: Refactor netlink
Don't use typedefs for enum types, and move PhoNet device enum over to common.h.
This commit is contained in:
parent
04146d62df
commit
6ac4d143a9
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue