From f7f89d0cfec33a3c2a2fe631e29b07eea31536f4 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 7 May 2011 12:42:40 +0200 Subject: select: use namespace prefix osmo_fd* and osmo_select* Summary of changes: s/struct bsc_fd/struct osmo_fd/g s/bsc_register_fd/osmo_fd_register/g s/bsc_unregister_fd/osmo_fd_unregister/g s/bsc_select_main/osmo_select_main/g --- include/osmocom/core/select.h | 10 +++++----- include/osmocom/core/write_queue.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'include/osmocom/core') diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index 5ca21c3e..476c564e 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -7,16 +7,16 @@ #define BSC_FD_WRITE 0x0002 #define BSC_FD_EXCEPT 0x0004 -struct bsc_fd { +struct osmo_fd { struct llist_head list; int fd; unsigned int when; - int (*cb)(struct bsc_fd *fd, unsigned int what); + int (*cb)(struct osmo_fd *fd, unsigned int what); void *data; unsigned int priv_nr; }; -int bsc_register_fd(struct bsc_fd *fd); -void bsc_unregister_fd(struct bsc_fd *fd); -int bsc_select_main(int polling); +int osmo_fd_register(struct osmo_fd *fd); +void osmo_fd_unregister(struct osmo_fd *fd); +int osmo_select_main(int polling); #endif /* _BSC_SELECT_H */ diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 3b730c77..8d360cbf 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -27,20 +27,20 @@ #include struct write_queue { - struct bsc_fd bfd; + struct osmo_fd bfd; unsigned int max_length; unsigned int current_length; struct llist_head msg_queue; - int (*read_cb)(struct bsc_fd *fd); - int (*write_cb)(struct bsc_fd *fd, struct msgb *msg); - int (*except_cb)(struct bsc_fd *fd); + int (*read_cb)(struct osmo_fd *fd); + int (*write_cb)(struct osmo_fd *fd, struct msgb *msg); + int (*except_cb)(struct osmo_fd *fd); }; void write_queue_init(struct write_queue *queue, int max_length); void write_queue_clear(struct write_queue *queue); int write_queue_enqueue(struct write_queue *queue, struct msgb *data); -int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what); +int write_queue_bfd_cb(struct osmo_fd *fd, unsigned int what); #endif -- cgit v1.2.3