projects
/
osmocom-bb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src: use namespace prefix osmo_fd* and osmo_select*
[osmocom-bb.git]
/
src
/
host
/
osmocon
/
osmoload.c
diff --git
a/src/host/osmocon/osmoload.c
b/src/host/osmocon/osmoload.c
index
6a31dc1
..
1471a2e
100644
(file)
--- a/
src/host/osmocon/osmoload.c
+++ b/
src/host/osmocon/osmoload.c
@@
-48,7
+48,7
@@
#define DEFAULT_SOCKET "/tmp/osmocom_loader"
#define DEFAULT_SOCKET "/tmp/osmocom_loader"
-static struct
bsc
_fd connection;
+static struct
osmo
_fd connection;
enum {
STATE_INIT,
enum {
STATE_INIT,
@@
-451,7
+451,7
@@
loader_handle_reply(struct msgb *msg) {
}
static int
}
static int
-loader_read_cb(struct
bsc
_fd *fd, unsigned int flags) {
+loader_read_cb(struct
osmo
_fd *fd, unsigned int flags) {
struct msgb *msg;
u_int16_t len;
int rc;
struct msgb *msg;
u_int16_t len;
int rc;
@@
-494,7
+494,7
@@
static void
loader_connect(const char *socket_path) {
int rc;
struct sockaddr_un local;
loader_connect(const char *socket_path) {
int rc;
struct sockaddr_un local;
- struct
bsc
_fd *conn = &connection;
+ struct
osmo
_fd *conn = &connection;
local.sun_family = AF_UNIX;
strncpy(local.sun_path, socket_path, sizeof(local.sun_path));
local.sun_family = AF_UNIX;
strncpy(local.sun_path, socket_path, sizeof(local.sun_path));
@@
-517,7
+517,7
@@
loader_connect(const char *socket_path) {
conn->cb = loader_read_cb;
conn->data = NULL;
conn->cb = loader_read_cb;
conn->data = NULL;
- if (
bsc_register_fd
(conn) != 0) {
+ if (
osmo_fd_register
(conn) != 0) {
fprintf(stderr, "Failed to register fd.\n");
exit(1);
}
fprintf(stderr, "Failed to register fd.\n");
exit(1);
}
@@
-1205,7
+1205,7
@@
main(int argc, char **argv) {
loader_command(argv[0], argc - optind, argv + optind);
while(!osmoload.quit) {
loader_command(argv[0], argc - optind, argv + optind);
while(!osmoload.quit) {
-
bsc
_select_main(0);
+
osmo
_select_main(0);
}
if(osmoload.binfile) {
}
if(osmoload.binfile) {