X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/8fce4520de1f257819b16f9253fa28dcdae743f4..59ecf21e36b2332f6adf2a568ef555283d8c119a:/lunaix-os/hal/char/serial.c?ds=sidebyside

diff --git a/lunaix-os/hal/char/serial.c b/lunaix-os/hal/char/serial.c
index 2c4a272..ddcd57f 100644
--- a/lunaix-os/hal/char/serial.c
+++ b/lunaix-os/hal/char/serial.c
@@ -15,24 +15,28 @@ static int serial_idx = 0;
 int
 serial_accept_one(struct serial_dev* sdev, u8_t val)
 {
-    return !!fifo_putone(&sdev->rxbuf, val);
+    return !!rbuffer_put(&sdev->rxbuf, val);
 }
 
 int
 serial_accept_buffer(struct serial_dev* sdev, void* val, size_t len)
 {
-    return !!fifo_write(&sdev->rxbuf, val, len);
+    return !!rbuffer_puts(&sdev->rxbuf, val, len);
 }
 
 void
 serial_end_recv(struct serial_dev* sdev)
 {
+    mark_device_done_read(sdev->dev);
+
     pwake_one(&sdev->wq_rxdone);
 }
 
 void
 serial_end_xmit(struct serial_dev* sdev, size_t len)
 {
+    mark_device_done_write(sdev->dev);
+
     sdev->wr_len = len;
     pwake_one(&sdev->wq_txdone);
 }
@@ -40,11 +44,11 @@ serial_end_xmit(struct serial_dev* sdev, size_t len)
 int
 serial_readone_nowait(struct serial_dev* sdev, u8_t* val)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
 
-    int rd_len = fifo_readone(&sdev->rxbuf, val);
+    int rd_len = rbuffer_get(&sdev->rxbuf, (char*)val);
 
-    mutex_unlock(&sdev->lock);
+    device_unlock(sdev->dev);
 
     return rd_len;
 }
@@ -52,26 +56,30 @@ serial_readone_nowait(struct serial_dev* sdev, u8_t* val)
 void
 serial_readone(struct serial_dev* sdev, u8_t* val)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
 
-    while (!fifo_readone(&sdev->rxbuf, val)) {
+    mark_device_doing_read(sdev->dev);
+
+    while (!rbuffer_get(&sdev->rxbuf, (char*)val)) {
         pwait(&sdev->wq_rxdone);
     }
 
-    mutex_unlock(&sdev->lock);
+    device_unlock(sdev->dev);
 }
 
 size_t
 serial_readbuf(struct serial_dev* sdev, u8_t* buf, size_t len)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
+
+    mark_device_doing_read(sdev->dev);
 
     size_t rdlen;
-    while (!(rdlen = fifo_read(&sdev->rxbuf, buf, len))) {
+    while (!(rdlen = rbuffer_gets(&sdev->rxbuf, (char*)buf, len))) {
         pwait(&sdev->wq_rxdone);
     }
 
-    mutex_unlock(&sdev->lock);
+    device_unlock(sdev->dev);
 
     return rdlen;
 }
@@ -79,11 +87,13 @@ serial_readbuf(struct serial_dev* sdev, u8_t* buf, size_t len)
 int
 serial_readbuf_nowait(struct serial_dev* sdev, u8_t* buf, size_t len)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
 
-    int rdlen = fifo_read(&sdev->rxbuf, buf, len);
+    mark_device_doing_read(sdev->dev);
 
-    mutex_unlock(&sdev->lock);
+    int rdlen = rbuffer_gets(&sdev->rxbuf, (char*)buf, len);
+
+    device_unlock(sdev->dev);
 
     return rdlen;
 }
@@ -91,7 +101,9 @@ serial_readbuf_nowait(struct serial_dev* sdev, u8_t* buf, size_t len)
 int
 serial_writebuf(struct serial_dev* sdev, u8_t* buf, size_t len)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
+
+    mark_device_doing_write(sdev->dev);
 
     if (sdev->write(sdev, buf, len) == RXTX_DONE) {
         goto done;
@@ -101,7 +113,7 @@ serial_writebuf(struct serial_dev* sdev, u8_t* buf, size_t len)
 
 done:
     int rdlen = sdev->wr_len;
-    mutex_unlock(&sdev->lock);
+    device_unlock(sdev->dev);
 
     return rdlen;
 }
@@ -109,12 +121,14 @@ done:
 int
 serial_writebuf_nowait(struct serial_dev* sdev, u8_t* buf, size_t len)
 {
-    mutex_lock(&sdev->lock);
+    device_lock(sdev->dev);
+
+    mark_device_doing_write(sdev->dev);
 
     sdev->write(sdev, buf, len);
     int rdlen = sdev->wr_len;
 
-    mutex_unlock(&sdev->lock);
+    device_unlock(sdev->dev);
 
     return rdlen;
 }
@@ -155,26 +169,41 @@ __serial_exec_command(struct device* dev, u32_t req, va_list args)
     return sdev->exec_cmd(sdev, req, args);
 }
 
+static int
+__serial_poll_event(struct device* dev)
+{
+    struct serial_dev* sdev = serial_device(dev);
+
+    return sdev->dev->poll_evflags;
+}
+
 #define RXBUF_SIZE 512
 
 struct serial_dev*
-serial_create()
+serial_create(struct devclass* class, char* if_ident)
 {
     struct serial_dev* sdev = valloc(sizeof(struct serial_dev));
-    struct device* dev = device_addseq(NULL, sdev, "ttyS%d", serial_idx++);
+    struct device* dev = device_allocseq(NULL, sdev);
     dev->ops.read = __serial_read;
     dev->ops.read_page = __serial_read_page;
     dev->ops.write = __serial_write;
     dev->ops.write_page = __serial_write_page;
     dev->ops.exec_cmd = __serial_exec_command;
+    dev->ops.poll = __serial_poll_event;
 
     sdev->dev = dev;
     dev->underlay = sdev;
 
-    fifo_init(&sdev->rxbuf, valloc(RXBUF_SIZE), RXBUF_SIZE, 0);
+    waitq_init(&sdev->wq_rxdone);
+    waitq_init(&sdev->wq_txdone);
+    rbuffer_init(&sdev->rxbuf, valloc(RXBUF_SIZE), RXBUF_SIZE);
     llist_append(&serial_devs, &sdev->sdev_list);
-    // llist_init_head(&sdev->cmds);
 
+    device_register(dev, class, "port%s%d", if_ident, class->variant);
+
+    sdev->at_term = term_create(dev, if_ident);
+
+    class->variant++;
     return sdev;
 }
 
@@ -184,7 +213,7 @@ serial_get_avilable()
     struct serial_dev *pos, *n;
     llist_for_each(pos, n, &serial_devs, sdev_list)
     {
-        if (!mutex_on_hold(&pos->lock)) {
+        if (!device_locked(pos->dev)) {
             return pos;
         }
     }