diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-05-09 18:58:33 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-05-09 18:59:47 +0200 |
commit | 63920cefa6465e53b732217194e387b817b61458 (patch) | |
tree | 0880ada9c9fab71d6be43280e46e909abd3defa7 /src/osmo-bts-litecell15/l1_transp_hw.c | |
parent | ee320d5b36378bcfebde055323a4d9ec46c354cb (diff) |
Use OSMO_FD_* instead of deprecated BSC_FD_*
New define is available since libosmocore 1.1.0, and we already require
1.3.0, so no need to update dependenices.
Let's change it to avoid people re-using old BSC_FD_READ symbol when
copy-pasting somewhere else.
Change-Id: Id51ccb2c273c5f0fa4986f28bbd69a72d2dbaa0e
Diffstat (limited to 'src/osmo-bts-litecell15/l1_transp_hw.c')
-rw-r--r-- | src/osmo-bts-litecell15/l1_transp_hw.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/osmo-bts-litecell15/l1_transp_hw.c b/src/osmo-bts-litecell15/l1_transp_hw.c index c8972be5..c353f43f 100644 --- a/src/osmo-bts-litecell15/l1_transp_hw.c +++ b/src/osmo-bts-litecell15/l1_transp_hw.c @@ -88,18 +88,18 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what) queue = container_of(fd, struct osmo_wqueue, bfd); - if (what & BSC_FD_READ) + if (what & OSMO_FD_READ) queue->read_cb(fd); - if (what & BSC_FD_EXCEPT) + if (what & OSMO_FD_EXCEPT) queue->except_cb(fd); - if (what & BSC_FD_WRITE) { + if (what & OSMO_FD_WRITE) { struct iovec iov[5]; struct msgb *msg, *tmp; int written, count = 0; - fd->when &= ~BSC_FD_WRITE; + fd->when &= ~OSMO_FD_WRITE; llist_for_each_entry(msg, &queue->msg_queue, list) { /* more writes than we have */ @@ -117,7 +117,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what) /* Nothing scheduled? This should not happen. */ if (count == 0) { if (!llist_empty(&queue->msg_queue)) - fd->when |= BSC_FD_WRITE; + fd->when |= OSMO_FD_WRITE; return 0; } @@ -125,7 +125,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what) if (written < 0) { /* nothing written?! */ if (!llist_empty(&queue->msg_queue)) - fd->when |= BSC_FD_WRITE; + fd->when |= OSMO_FD_WRITE; return 0; } @@ -144,7 +144,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what) } if (!llist_empty(&queue->msg_queue)) - fd->when |= BSC_FD_WRITE; + fd->when |= OSMO_FD_WRITE; } return 0; @@ -269,7 +269,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl) read_ofd->priv_nr = q; read_ofd->data = hdl; read_ofd->cb = l1if_fd_cb; - read_ofd->when = BSC_FD_READ; + read_ofd->when = OSMO_FD_READ; rc = osmo_fd_register(read_ofd); if (rc < 0) { close(read_ofd->fd); @@ -292,7 +292,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl) write_ofd->fd = rc; write_ofd->priv_nr = q; write_ofd->data = hdl; - write_ofd->when = BSC_FD_WRITE; + write_ofd->when = OSMO_FD_WRITE; rc = osmo_fd_register(write_ofd); if (rc < 0) { close(write_ofd->fd); |