#include <lunaix/device.h>
#include <lunaix/mm/valloc.h>
#include <lunaix/spike.h>
+#include <lunaix/owloysius.h>
#include <lunaix/status.h>
+#include <lunaix/syslog.h>
-#include <sys/mm/mempart.h>
+#include <asm/pagetable.h>
#include <hal/serial.h>
+LOG_MODULE("serial")
+
+#define lock_sdev(sdev) device_lock((sdev)->dev)
+#define unlock_sdev(sdev) device_unlock((sdev)->dev)
+#define unlock_and_wait(sdev, wq) \
+ ({ \
+ unlock_sdev(sdev); \
+ pwait(&(sdev)->wq); \
+ lock_sdev(sdev); \
+ })
+
static DEFINE_LLIST(serial_devs);
static int serial_idx = 0;
+static struct device_cat* serial_cat;
+
#define serial_device(dev) ((struct serial_dev*)(dev)->underlay)
int
mark_device_done_read(sdev->dev);
pwake_one(&sdev->wq_rxdone);
+
+ term_notify_data_avaliable(sdev->tp_cap);
}
void
int
serial_readone_nowait(struct serial_dev* sdev, u8_t* val)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
int rd_len = rbuffer_get(&sdev->rxbuf, (char*)val);
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
return rd_len;
}
void
serial_readone(struct serial_dev* sdev, u8_t* val)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
mark_device_doing_read(sdev->dev);
while (!rbuffer_get(&sdev->rxbuf, (char*)val)) {
- pwait(&sdev->wq_rxdone);
+ unlock_and_wait(sdev, wq_rxdone);
}
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
}
size_t
serial_readbuf(struct serial_dev* sdev, u8_t* buf, size_t len)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
mark_device_doing_read(sdev->dev);
size_t rdlen;
while (!(rdlen = rbuffer_gets(&sdev->rxbuf, (char*)buf, len))) {
- pwait(&sdev->wq_rxdone);
+ unlock_and_wait(sdev, wq_rxdone);
}
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
return rdlen;
}
int
serial_readbuf_nowait(struct serial_dev* sdev, u8_t* buf, size_t len)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
mark_device_doing_read(sdev->dev);
int rdlen = rbuffer_gets(&sdev->rxbuf, (char*)buf, len);
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
return rdlen;
}
int
serial_writebuf(struct serial_dev* sdev, u8_t* buf, size_t len)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
mark_device_doing_write(sdev->dev);
goto done;
}
- pwait(&sdev->wq_txdone);
+ unlock_and_wait(sdev, wq_txdone);
done:
int rdlen = sdev->wr_len;
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
return rdlen;
}
int
serial_writebuf_nowait(struct serial_dev* sdev, u8_t* buf, size_t len)
{
- device_lock(sdev->dev);
+ lock_sdev(sdev);
mark_device_doing_write(sdev->dev);
sdev->write(sdev, buf, len);
int rdlen = sdev->wr_len;
- device_unlock(sdev->dev);
+ unlock_sdev(sdev);
return rdlen;
}
static int
-__serial_read(struct device* dev, void* buf, size_t offset, size_t len)
+__serial_read(struct device* dev, void* buf, off_t fpos, size_t len)
+{
+ return serial_readbuf(serial_device(dev), (u8_t*)buf, len);
+}
+
+static int
+__serial_read_async(struct device* dev, void* buf, off_t fpos, size_t len)
+{
+ return serial_readbuf_nowait(
+ serial_device(dev), (u8_t*)buf, len);
+}
+
+static int
+__serial_read_page(struct device* dev, void* buf, off_t fpos)
{
- return serial_readbuf(serial_device(dev), &((u8_t*)buf)[offset], len);
+ return serial_readbuf(serial_device(dev), (u8_t*)buf, PAGE_SIZE);
}
static int
-__serial_read_page(struct device* dev, void* buf, size_t offset)
+__serial_write(struct device* dev, void* buf, off_t fpos, size_t len)
{
- return serial_readbuf(serial_device(dev), &((u8_t*)buf)[offset], MEM_PAGE);
+ return serial_writebuf(serial_device(dev), (u8_t*)buf, len);
}
static int
-__serial_write(struct device* dev, void* buf, size_t offset, size_t len)
+__serial_write_async(struct device* dev, void* buf, off_t fpos, size_t len)
{
- return serial_writebuf(serial_device(dev), &((u8_t*)buf)[offset], len);
+ return serial_writebuf_nowait(
+ serial_device(dev), (u8_t*)buf, len);
}
static int
-__serial_write_page(struct device* dev, void* buf, size_t offset)
+__serial_write_page(struct device* dev, void* buf, off_t fpos)
{
- return serial_writebuf(serial_device(dev), &((u8_t*)buf)[offset], MEM_PAGE);
+ return serial_writebuf(serial_device(dev), (u8_t*)buf, PAGE_SIZE);
}
static int
return sdev->dev->poll_evflags;
}
+static void sdev_execmd(struct serial_dev* sdev, u32_t req, ...)
+{
+ va_list args;
+ va_start(args, req);
+
+ sdev->exec_cmd(sdev, req, args);
+
+ va_end(args);
+}
+
+static void
+__serial_set_speed(struct device* dev, speed_t speed)
+{
+ struct serial_dev* sdev = serial_device(dev);
+ lock_sdev(sdev);
+
+ sdev_execmd(sdev, SERIO_SETBRDRATE, speed);
+
+ unlock_sdev(sdev);
+}
+
+static void
+__serial_set_baseclk(struct device* dev, unsigned int base)
+{
+ struct serial_dev* sdev = serial_device(dev);
+ lock_sdev(sdev);
+
+ sdev_execmd(sdev, SERIO_SETBRDBASE, base);
+
+ unlock_sdev(sdev);
+}
+
+static void
+__serial_set_cntrl_mode(struct device* dev, tcflag_t cflag)
+{
+ struct serial_dev* sdev = serial_device(dev);
+ lock_sdev(sdev);
+
+ sdev_execmd(sdev, SERIO_SETCNTRLMODE, cflag);
+
+ unlock_sdev(sdev);
+}
+
#define RXBUF_SIZE 512
+static struct termport_pot_ops tppot_ops = {
+ .set_cntrl_mode = __serial_set_cntrl_mode,
+ .set_clkbase = __serial_set_baseclk,
+ .set_speed = __serial_set_speed
+};
+
struct serial_dev*
serial_create(struct devclass* class, char* if_ident)
{
- struct serial_dev* sdev = valloc(sizeof(struct serial_dev));
- struct device* dev = device_allocseq(NULL, sdev);
+ struct serial_dev* sdev;
+ struct device* dev;
+
+ sdev = vzalloc(sizeof(struct serial_dev));
+ dev = device_allocseq(dev_meta(serial_cat), sdev);
+
dev->ops.read = __serial_read;
dev->ops.read_page = __serial_read_page;
+ dev->ops.read_async = __serial_read_async;
+ dev->ops.write_async = __serial_write_async;
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;
waitq_init(&sdev->wq_txdone);
rbuffer_init(&sdev->rxbuf, valloc(RXBUF_SIZE), RXBUF_SIZE);
llist_append(&serial_devs, &sdev->sdev_list);
+
+ register_device_var(dev, class, "%s", if_ident);
- device_register(dev, class, "port%s%d", if_ident, class->variant);
+ INFO("interface: %s, %xh:%xh.%d", dev->name_val,
+ class->fn_grp, class->device, class->variant);
- sdev->at_term = term_create(dev, if_ident);
+ sdev->tp_cap = term_attach_potens(dev, &tppot_ops, if_ident);
- class->variant++;
return sdev;
}
}
return NULL;
-}
\ No newline at end of file
+}
+
+static void
+init_serial_dev()
+{
+ serial_cat = device_addcat(NULL, "serial");
+
+ assert(serial_cat);
+}
+owloysius_fetch_init(init_serial_dev, on_earlyboot)
\ No newline at end of file
git://scm.lunaixsky.com / lunaix-os.git / blobdiff