Changes in / [16639bb:f7ea5400] in mainline

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/edit/edit.c (modified) (1 diff)
• uspace/app/sportdmp/sportdmp.c (modified) (1 diff)
• uspace/drv/bus/usb/usbmast/main.c (modified) (4 diffs)
• uspace/drv/bus/usb/usbmast/usbmast.h (modified) (1 diff)
• uspace/drv/char/ns8250/cyclic_buffer.h (modified) (1 diff)
• uspace/drv/char/ns8250/ns8250.c (modified) (11 diffs)
• uspace/lib/c/generic/bd_srv.c (modified) (10 diffs)
• uspace/lib/c/include/bd_srv.h (modified) (3 diffs)
• uspace/lib/c/include/ipc/input.h (modified) (1 diff)
• uspace/lib/c/include/ipc/mouseev.h (modified) (1 diff)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (5 diffs)
• uspace/srv/bd/ata_bd/ata_bd.h (modified) (1 diff)
• uspace/srv/bd/file_bd/file_bd.c (modified) (4 diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (5 diffs)
• uspace/srv/bd/part/guid_part/guid_part.c (modified) (5 diffs)
• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (5 diffs)
• uspace/srv/bd/rd/rd.c (modified) (3 diffs)
• uspace/srv/bd/sata_bd/sata_bd.c (modified) (4 diffs)
• uspace/srv/bd/sata_bd/sata_bd.h (modified) (1 diff)
• uspace/srv/hid/console/console.c (modified) (2 diffs)
• uspace/srv/hid/input/generic/input.c (modified) (1 diff)
• uspace/srv/hid/input/include/mouse.h (modified) (1 diff)
• uspace/srv/hid/input/proto/mousedev.c (modified) (1 diff)
• uspace/srv/hid/isdv4_tablet/Makefile (deleted)
• uspace/srv/hid/isdv4_tablet/isdv4.c (deleted)
• uspace/srv/hid/isdv4_tablet/isdv4.h (deleted)
• uspace/srv/hid/isdv4_tablet/main.c (deleted)

boot/Makefile.common

@@ -108 +108 @@
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \

uspace/Makefile

@@ -102 +102 @@
         srv/hid/console \
         srv/hid/s3c24xx_ts \
-        srv/hid/isdv4_tablet \
         srv/hid/fb \
         srv/hid/input \

uspace/app/edit/edit.c

@@ -842 +842 @@
                 /* Fill until the end of display area. */
 
-                if ((unsigned)s_column - 1 < scr_columns)
-                        fill = scr_columns - (s_column - 1);
+                if (str_length(row_buf) < (unsigned) scr_columns)
+                        fill = scr_columns - str_length(row_buf);
                 else
                         fill = 0;

uspace/app/sportdmp/sportdmp.c

@@ -140 +140 @@
                 ssize_t i;
                 for (i = 0; i < read; i++) {
-                        printf("%02hhx ", buf[i]);
+                        if ((buf[i] >= 32) && (buf[i] < 128))
+                                putchar((wchar_t) buf[i]);
+                        else
+                                putchar('.');
+                        fflush(stdout);
                 }
-                fflush(stdout);
         }
         

uspace/drv/bus/usb/usbmast/main.c

@@ -82 +82 @@
     void *arg);
 
-static int usbmast_bd_open(bd_srvs_t *, bd_srv_t *);
+static int usbmast_bd_open(bd_srv_t *);
 static int usbmast_bd_close(bd_srv_t *);
 static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -100 +100 @@
 static usbmast_fun_t *bd_srv_usbmast(bd_srv_t *bd)
 {
-        return (usbmast_fun_t *)bd->srvs->sarg;
+        return (usbmast_fun_t *)bd->arg;
 }
 
@@ -240 +240 @@
         mfun->lun = lun;
 
-        bd_srvs_init(&mfun->bds);
-        mfun->bds.ops = &usbmast_bd_ops;
-        mfun->bds.sarg = mfun;
+        bd_srv_init(&mfun->bd);
+        mfun->bd.ops = &usbmast_bd_ops;
+        mfun->bd.arg = mfun;
 
         /* Set up a connection handler. */
@@ -311 +311 @@
 
         mfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
-        bd_conn(iid, icall, &mfun->bds);
+        bd_conn(iid, icall, &mfun->bd);
 }
 
 /** Open device. */
-static int usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int usbmast_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/drv/bus/usb/usbmast/usbmast.h

@@ -69 +69 @@
         /** Block size in bytes */
         size_t block_size;
-        /** Block device service structure */
-        bd_srvs_t bds;
+        /** Block device server structure */
+        bd_srv_t bd;
 } usbmast_fun_t;
 

uspace/drv/char/ns8250/cyclic_buffer.h

@@ -36 +36 @@
 #define CYCLIC_BUFFER_H_
 
-#define BUF_LEN 4096
+#define BUF_LEN 256
 
 typedef struct cyclic_buffer {

uspace/drv/char/ns8250/ns8250.c

@@ -82 +82 @@
 /** Interrupt ID Register definition. */
 #define NS8250_IID_ACTIVE       (1 << 0)
-#define NS8250_IID_CAUSE_MASK 0x0e
-#define NS8250_IID_CAUSE_RXSTATUS 0x06
 
 /** FIFO Control Register definition. */
@@ -181 +179 @@
         /** The fibril mutex for synchronizing the access to the device. */
         fibril_mutex_t mutex;
-        /** Indicates that some data has become available */
-        fibril_condvar_t input_buffer_available;
         /** True if device is removed. */
         bool removed;
@@ -242 +238 @@
 {
         ns8250_t *ns = NS8250(fun);
-        int ret = 0;
-        
-        if (count == 0) return 0;
+        int ret = EOK;
         
         fibril_mutex_lock(&ns->mutex);
-        while (buf_is_empty(&ns->input_buffer))
-                fibril_condvar_wait(&ns->input_buffer_available, &ns->mutex);
         while (!buf_is_empty(&ns->input_buffer) && (size_t)ret < count) {
                 buf[ret] = (char)buf_pop_front(&ns->input_buffer);
@@ -468 +460 @@
 {
         /* Interrupt when data received. */
-        pio_write_8(&regs->ier, NS8250_IER_RXREADY | NS8250_IER_RXSTATUS);
+        pio_write_8(&regs->ier, NS8250_IER_RXREADY);
         pio_write_8(&regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS 
             | NS8250_MCR_OUT2);
@@ -507 +499 @@
         async_exchange_end(exch);
 
-        /* Read LSR to clear possible previous LSR interrupt */
-        pio_read_8(&ns->regs->lsr);
-
         /* Enable interrupt on the serial port. */
         ns8250_port_interrupts_enable(ns->regs);
@@ -706 +695 @@
         /* 8 bits, no parity, two stop bits. */
         ns8250_port_set_com_props(ns->regs, SERIAL_NO_PARITY, 8, 2);
-        /*
-         * Enable FIFO, clear them, with 4-byte threshold for greater
-         * reliability.
-         */
+        /* Enable FIFO, clear them, with 14-byte threshold. */
         pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE
-            | NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET
-            | NS8250_FCR_RXTRIGGERLOW);
+            | NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET 
+            | NS8250_FCR_RXTRIGGERLOW | NS8250_FCR_RXTRIGGERHI);
         /*
          * RTS/DSR set (Request to Send and Data Terminal Ready lines enabled),
@@ -745 +731 @@
         bool cont = true;
         
-        fibril_mutex_lock(&ns->mutex);
         while (cont) {
+                fibril_mutex_lock(&ns->mutex);
+                
                 cont = ns8250_received(regs);
                 if (cont) {
@@ -752 +739 @@
                         
                         if (ns->client_connected) {
-                                bool buf_was_empty = buf_is_empty(&ns->input_buffer);
                                 if (!buf_push_back(&ns->input_buffer, val)) {
                                         ddf_msg(LVL_WARN, "Buffer overflow on "
                                             "%s.", ns->dev->name);
-                                        break;
                                 } else {
                                         ddf_msg(LVL_DEBUG2, "Character %c saved "
                                             "to the buffer of %s.",
                                             val, ns->dev->name);
-                                        if (buf_was_empty)
-                                                fibril_condvar_broadcast(&ns->input_buffer_available);
                                 }
                         }
                 }
-        }
-        fibril_mutex_unlock(&ns->mutex);
-        fibril_yield();
+                
+                fibril_mutex_unlock(&ns->mutex);
+                fibril_yield();
+        }
 }
 
 /** The interrupt handler.
  *
- * The serial port is initialized to interrupt when some data come or line
- * status register changes, so the interrupt is handled by reading the incoming
- * data and reading the line status register.
+ * The serial port is initialized to interrupt when some data come, so the
+ * interrupt is handled by reading the incomming data.
  *
  * @param dev           The serial port device.
@@ -782 +765 @@
     ipc_call_t *icall)
 {
-        ns8250_t *ns = NS8250_FROM_DEV(dev);
-
-        uint8_t iir = pio_read_8(&ns->regs->iid);
-        if ((iir & NS8250_IID_CAUSE_MASK) == NS8250_IID_CAUSE_RXSTATUS) {
-                uint8_t lsr = pio_read_8(&ns->regs->lsr);
-                if (lsr & NS8250_LSR_OE) {
-                        ddf_msg(LVL_WARN, "Overrun error on %s", ns->dev->name);
-                }
-        }
-        
-        ns8250_read_from_device(ns);
+        ns8250_read_from_device(NS8250_FROM_DEV(dev));
 }
 
@@ -838 +811 @@
         
         fibril_mutex_initialize(&ns->mutex);
-        fibril_condvar_initialize(&ns->input_buffer_available);
         ns->dev = dev;
         
@@ -1081 +1053 @@
 static void ns8250_init(void)
 {
-        ddf_log_init(NAME, LVL_WARN);
+        ddf_log_init(NAME, LVL_ERROR);
         
         ns8250_dev_ops.open = &ns8250_open;

uspace/lib/c/generic/bd_srv.c

@@ -67 +67 @@
         }
 
-        if (srv->srvs->ops->read_blocks == NULL) {
+        if (srv->ops->read_blocks == NULL) {
                 async_answer_0(rcallid, ENOTSUP);
                 async_answer_0(callid, ENOTSUP);
@@ -73 +73 @@
         }
 
-        rc = srv->srvs->ops->read_blocks(srv, ba, cnt, buf, size);
+        rc = srv->ops->read_blocks(srv, ba, cnt, buf, size);
         if (rc != EOK) {
                 async_answer_0(rcallid, ENOMEM);
@@ -109 +109 @@
         }
 
-        if (srv->srvs->ops->read_toc == NULL) {
+        if (srv->ops->read_toc == NULL) {
                 async_answer_0(rcallid, ENOTSUP);
                 async_answer_0(callid, ENOTSUP);
@@ -115 +115 @@
         }
 
-        rc = srv->srvs->ops->read_toc(srv, session, buf, size);
+        rc = srv->ops->read_toc(srv, session, buf, size);
         if (rc != EOK) {
                 async_answer_0(rcallid, ENOMEM);
@@ -146 +146 @@
         }
 
-        if (srv->srvs->ops->write_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->write_blocks(srv, ba, cnt, data, size);
+        if (srv->ops->write_blocks == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->write_blocks(srv, ba, cnt, data, size);
         free(data);
         async_answer_0(callid, rc);
@@ -162 +162 @@
         size_t block_size;
 
-        if (srv->srvs->ops->get_block_size == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->get_block_size(srv, &block_size);
+        if (srv->ops->get_block_size == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_block_size(srv, &block_size);
         async_answer_1(callid, rc, block_size);
 }
@@ -177 +177 @@
         aoff64_t num_blocks;
 
-        if (srv->srvs->ops->get_num_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->get_num_blocks(srv, &num_blocks);
+        if (srv->ops->get_num_blocks == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_num_blocks(srv, &num_blocks);
         async_answer_2(callid, rc, LOWER32(num_blocks), UPPER32(num_blocks));
 }
 
-static bd_srv_t *bd_srv_create(bd_srvs_t *srvs)
-{
-        bd_srv_t *srv;
-
-        srv = calloc(1, sizeof(srv));
-        if (srv == NULL)
-                return NULL;
-
-        srv->srvs = srvs;
-        return srv;
-}
-
-void bd_srvs_init(bd_srvs_t *srvs)
-{
-        srvs->ops = NULL;
-        srvs->sarg = NULL;
-}
-
-int bd_conn(ipc_callid_t iid, ipc_call_t *icall, bd_srvs_t *srvs)
-{
-        bd_srv_t *srv;
-        int rc;
+void bd_srv_init(bd_srv_t *srv)
+{
+        fibril_mutex_initialize(&srv->lock);
+        srv->connected = false;
+        srv->ops = NULL;
+        srv->arg = NULL;
+        srv->client_sess = NULL;
+}
+
+int bd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        bd_srv_t *srv = (bd_srv_t *)arg;
+        int rc;
+
+        fibril_mutex_lock(&srv->lock);
+        if (srv->connected) {
+                fibril_mutex_unlock(&srv->lock);
+                async_answer_0(iid, EBUSY);
+                return EBUSY;
+        }
+
+        srv->connected = true;
+        fibril_mutex_unlock(&srv->lock);
 
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
-        srv = bd_srv_create(srvs);
-        if (srv == NULL)
-                return ENOMEM;
 
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
@@ -222 +219 @@
         srv->client_sess = sess;
 
-        rc = srvs->ops->open(srvs, srv);
+        rc = srv->ops->open(srv);
         if (rc != EOK)
                 return rc;
@@ -233 +230 @@
                 if (!method) {
                         /* The other side has hung up */
+                        fibril_mutex_lock(&srv->lock);
+                        srv->connected = false;
+                        fibril_mutex_unlock(&srv->lock);
                         async_answer_0(callid, EOK);
                         break;
@@ -258 +258 @@
         }
 
-        rc = srvs->ops->close(srv);
-        free(srv);
-
-        return rc;
+        return srv->ops->close(srv);
 }
 

uspace/lib/c/include/bd_srv.h

@@ -36 +36 @@
 #define LIBC_BD_SRV_H_
 
-#include <adt/list.h>
 #include <async.h>
 #include <fibril_synch.h>
@@ -44 +43 @@
 typedef struct bd_ops bd_ops_t;
 
-/** Service setup (per sevice) */
 typedef struct {
+        fibril_mutex_t lock;
+        bool connected;
         bd_ops_t *ops;
-        void *sarg;
-} bd_srvs_t;
-
-/** Server structure (per client session) */
-typedef struct {
-        bd_srvs_t *srvs;
+        void *arg;
         async_sess_t *client_sess;
-        void *carg;
 } bd_srv_t;
 
 typedef struct bd_ops {
-        int (*open)(bd_srvs_t *, bd_srv_t *);
+        int (*open)(bd_srv_t *);
         int (*close)(bd_srv_t *);
         int (*read_blocks)(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -67 +61 @@
 } bd_ops_t;
 
-extern void bd_srvs_init(bd_srvs_t *);
+extern void bd_srv_init(bd_srv_t *);
 
-extern int bd_conn(ipc_callid_t, ipc_call_t *, bd_srvs_t *);
+extern int bd_conn(ipc_callid_t, ipc_call_t *, void *);
 
 #endif

uspace/lib/c/include/ipc/input.h

@@ -46 +46 @@
         INPUT_EVENT_KEY = IPC_FIRST_USER_METHOD,
         INPUT_EVENT_MOVE,
-        INPUT_EVENT_ABS_MOVE,
         INPUT_EVENT_BUTTON
 } input_notif_t;

uspace/lib/c/include/ipc/mouseev.h

@@ -47 +47 @@
 typedef enum {
         MOUSEEV_MOVE_EVENT = IPC_FIRST_USER_METHOD,
-        MOUSEEV_ABS_MOVE_EVENT,
         MOUSEEV_BUTTON_EVENT
 } mouseev_notif_t;

uspace/srv/bd/ata_bd/ata_bd.c

@@ -104 +104 @@
 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 
-static int ata_bd_open(bd_srvs_t *, bd_srv_t *);
+static int ata_bd_open(bd_srv_t *);
 static int ata_bd_close(bd_srv_t *);
 static int ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
@@ -146 +146 @@
 static disk_t *bd_srv_disk(bd_srv_t *bd)
 {
-        return (disk_t *)bd->srvs->sarg;
+        return (disk_t *)bd->arg;
 }
 
@@ -312 +312 @@
         }
 
-        bd_conn(iid, icall, &ata_disk[disk_id].bds);
+        bd_conn(iid, icall, &ata_disk[disk_id].bd);
 }
 
@@ -336 +336 @@
         fibril_mutex_initialize(&d->lock);
 
-        bd_srvs_init(&d->bds);
-        d->bds.ops = &ata_bd_ops;
-        d->bds.sarg = d;
+        bd_srv_init(&d->bd);
+        d->bd.ops = &ata_bd_ops;
+        d->bd.arg = d;
 
         /* Try identify command. */
@@ -467 +467 @@
 }
 
-static int ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int ata_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/ata_bd/ata_bd.h

@@ -119 +119 @@
         service_id_t service_id;
         int disk_id;
-        bd_srvs_t bds;
+        bd_srv_t bd;
 } disk_t;
 

uspace/srv/bd/file_bd/file_bd.c

@@ -62 +62 @@
 
 static service_id_t service_id;
-static bd_srvs_t bd_srvs;
+static bd_srv_t bd_srv;
 static fibril_mutex_t dev_lock;
 
@@ -69 +69 @@
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 
-static int file_bd_open(bd_srvs_t *, bd_srv_t *);
+static int file_bd_open(bd_srv_t *);
 static int file_bd_close(bd_srv_t *);
 static int file_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -154 +154 @@
 static int file_bd_init(const char *fname)
 {
-        bd_srvs_init(&bd_srvs);
-        bd_srvs.ops = &file_bd_ops;
+        bd_srv_init(&bd_srv);
+        bd_srv.ops = &file_bd_ops;
         
         async_set_client_connection(file_bd_connection);
@@ -188 +188 @@
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        bd_conn(iid, icall, &bd_srvs);
+        bd_conn(iid, icall, &bd_srv);
 }
 
 /** Open device. */
-static int file_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int file_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -88 +88 @@
 /** GXE block device soft state */
 typedef struct {
-        /** Block device service structure */
-        bd_srvs_t bds;
+        /** Block device server structure */
+        bd_srv_t bd;
         int disk_id;
 } gxe_bd_t;
@@ -109 +109 @@
 static int gxe_bd_write_block(int disk_id, uint64_t ba, const void *buf);
 
-static int gxe_bd_open(bd_srvs_t *, bd_srv_t *);
+static int gxe_bd_open(bd_srv_t *);
 static int gxe_bd_close(bd_srv_t *);
 static int gxe_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -127 +127 @@
 static gxe_bd_t *bd_srv_gxe(bd_srv_t *bd)
 {
-        return (gxe_bd_t *)bd->srvs->sarg;
+        return (gxe_bd_t *)bd->arg;
 }
 
@@ -166 +166 @@
                 char name[16];
                 
-                bd_srvs_init(&gxe_bd[i].bds);
-                gxe_bd[i].bds.ops = &gxe_bd_ops;
-                gxe_bd[i].bds.sarg = (void *)&gxe_bd[i];
+                bd_srv_init(&gxe_bd[i].bd);
+                gxe_bd[i].bd.ops = &gxe_bd_ops;
+                gxe_bd[i].bd.arg = (void *)&gxe_bd[i];
                 
                 snprintf(name, 16, "%s/disk%u", NAMESPACE, i);
@@ -203 +203 @@
         }
 
-        bd_conn(iid, icall, &gxe_bd[disk_id].bds);
+        bd_conn(iid, icall, &gxe_bd[disk_id].bd);
 }
 
 /** Open device. */
-static int gxe_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int gxe_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/part/guid_part/guid_part.c

@@ -83 +83 @@
         /** Service representing the partition (outbound device) */
         service_id_t dsid;
-        /** Block device service structure */
-        bd_srvs_t bds;
+        /** Block device server structure */
+        bd_srv_t bd;
         /** Points to next partition structure. */
         struct part *next;
@@ -104 +104 @@
 static int gpt_bsa_translate(part_t *p, aoff64_t ba, size_t cnt, aoff64_t *gba);
 
-static int gpt_bd_open(bd_srvs_t *, bd_srv_t *);
+static int gpt_bd_open(bd_srv_t *);
 static int gpt_bd_close(bd_srv_t *);
 static int gpt_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -122 +122 @@
 static part_t *bd_srv_part(bd_srv_t *bd)
 {
-        return (part_t *)bd->srvs->sarg;
+        return (part_t *)bd->arg;
 }
 
@@ -325 +325 @@
         }
 
-        bd_srvs_init(&part->bds);
-        part->bds.ops = &gpt_bd_ops;
-        part->bds.sarg = part;
+        bd_srv_init(&part->bd);
+        part->bd.ops = &gpt_bd_ops;
+        part->bd.arg = part;
 
         part->dsid = 0;
@@ -357 +357 @@
         assert(part->present == true);
 
-        bd_conn(iid, icall, &part->bds);
+        bd_conn(iid, icall, &part->bd);
 }
 
 /** Open device. */
-static int gpt_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int gpt_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -100 +100 @@
         /** Device representing the partition (outbound device) */
         service_id_t dsid;
-        /** Block device service sturcture */
-        bd_srvs_t bds;
+        /** Block device server structure */
+        bd_srv_t bd;
         /** Points to next partition structure. */
         struct part *next;
@@ -154 +154 @@
 static int mbr_bsa_translate(part_t *p, uint64_t ba, size_t cnt, uint64_t *gba);
 
-static int mbr_bd_open(bd_srvs_t *, bd_srv_t *);
+static int mbr_bd_open(bd_srv_t *);
 static int mbr_bd_close(bd_srv_t *);
 static int mbr_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -172 +172 @@
 static part_t *bd_srv_part(bd_srv_t *bd)
 {
-        return (part_t *)bd->srvs->sarg;
+        return (part_t *)bd->arg;
 }
 
@@ -402 +402 @@
         part->present = (pte->ptype != PT_UNUSED) ? true : false;
 
-        bd_srvs_init(&part->bds);
-        part->bds.ops = &mbr_bd_ops;
-        part->bds.sarg = part;
+        bd_srv_init(&part->bd);
+        part->bd.ops = &mbr_bd_ops;
+        part->bd.arg = part;
 
         part->dsid = 0;
@@ -433 +433 @@
 
         assert(part->present == true);
-        bd_conn(iid, icall, &part->bds);
+        bd_conn(iid, icall, &part->bd);
 }
 
 /** Open device. */
-static int mbr_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int mbr_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/rd/rd.c

@@ -68 +68 @@
 static const size_t block_size = 512;
 
-static int rd_open(bd_srvs_t *, bd_srv_t *);
+static int rd_open(bd_srv_t *);
 static int rd_close(bd_srv_t *);
 static int rd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -93 +93 @@
 };
 
-static bd_srvs_t bd_srvs;
+static bd_srv_t bd_srv;
 
 static void rd_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        bd_conn(iid, icall, &bd_srvs);
+        bd_conn(iid, icall, &bd_srv);
 }
 
 /** Open device. */
-static int rd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int rd_open(bd_srv_t *bd)
 {
         return EOK;
@@ -175 +175 @@
             (void *) addr_phys, size);
         
-        bd_srvs_init(&bd_srvs);
-        bd_srvs.ops = &rd_bd_ops;
+        bd_srv_init(&bd_srv);
+        bd_srv.ops = &rd_bd_ops;
         
         async_set_client_connection(rd_client_conn);

uspace/srv/bd/sata_bd/sata_bd.c

@@ -57 +57 @@
 static int disk_count;
 
-static int sata_bd_open(bd_srvs_t *, bd_srv_t *);
+static int sata_bd_open(bd_srv_t *);
 static int sata_bd_close(bd_srv_t *);
 static int sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -75 +75 @@
 static sata_bd_dev_t *bd_srv_sata(bd_srv_t *bd)
 {
-        return (sata_bd_dev_t *)bd->srvs->sarg;
+        return (sata_bd_dev_t *)bd->arg;
 }
 
@@ -104 +104 @@
                 ahci_get_num_blocks(disk[disk_count].sess, &disk[disk_count].blocks);
                 
-                bd_srvs_init(&disk[disk_count].bds);
-                disk[disk_count].bds.ops = &sata_bd_ops;
-                disk[disk_count].bds.sarg = &disk[disk_count];
+                bd_srv_init(&disk[disk_count].bd);
+                disk[disk_count].bd.ops = &sata_bd_ops;
+                disk[disk_count].bd.arg = &disk[disk_count];
                 
                 printf("Device %s - %s , blocks: %lu, block_size: %lu\n", 
@@ -183 +183 @@
         }
 
-        bd_conn(iid, icall, &disk[disk_id].bds);
+        bd_conn(iid, icall, &disk[disk_id].bd);
 }
 
 /** Open device. */
-static int sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static int sata_bd_open(bd_srv_t *bd)
 {
         return EOK;

uspace/srv/bd/sata_bd/sata_bd.h

@@ -58 +58 @@
         size_t block_size;
         /** Block device server structure */
-        bd_srvs_t bds;
+        bd_srv_t bd;
 } sata_bd_dev_t;
 

uspace/srv/hid/console/console.c

@@ -383 +383 @@
         
         fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
-}
-
-static void cons_mouse_abs_move(sysarg_t x, sysarg_t y,
-    sysarg_t max_x, sysarg_t max_y)
-{
-        if (max_x && max_y) {
-                mouse.x = limit(x * xres / max_x, 0, xres);
-                mouse.y = limit(y * yres / max_y, 0, yres);
-                
-                fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
-        }
 }
 
@@ -514 +503 @@
                         async_answer_0(callid, EOK);
                         break;
-                case INPUT_EVENT_ABS_MOVE:
-                        cons_mouse_abs_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call),
-                            IPC_GET_ARG3(call), IPC_GET_ARG4(call));
-                        async_answer_0(callid, EOK);
-                        break;
                 case INPUT_EVENT_BUTTON:
                         /* Got pointer button press/release event */

uspace/srv/hid/input/generic/input.c

@@ -191 +191 @@
 }
 
-/** Mouse pointer has moved in absolute mode. */
-void mouse_push_event_abs_move(mouse_dev_t *mdev, unsigned int x, unsigned int y,
-    unsigned int max_x, unsigned int max_y)
-{
-        if (max_x && max_y) {
-                async_exch_t *exch = async_exchange_begin(client_sess);
-                async_msg_4(exch, INPUT_EVENT_ABS_MOVE, x, y, max_x, max_y);
-                async_exchange_end(exch);
-        }
-}
-
 /** Mouse button has been pressed. */
 void mouse_push_event_button(mouse_dev_t *mdev, int bnum, int press)

uspace/srv/hid/input/include/mouse.h

@@ -63 +63 @@
 extern void mouse_push_data(mouse_dev_t *, sysarg_t);
 extern void mouse_push_event_move(mouse_dev_t *, int, int, int);
-extern void mouse_push_event_abs_move(mouse_dev_t *, unsigned int, unsigned int,
-    unsigned int, unsigned int);
 extern void mouse_push_event_button(mouse_dev_t *, int, int);
 

uspace/srv/hid/input/proto/mousedev.c

@@ -96 +96 @@
                         retval = EOK;
                         break;
-                case MOUSEEV_ABS_MOVE_EVENT:
-                        mouse_push_event_abs_move(mousedev->mouse_dev,
-                                IPC_GET_ARG1(call), IPC_GET_ARG2(call),
-                                IPC_GET_ARG3(call), IPC_GET_ARG4(call));
-                        retval = EOK;
-                        break;
                 case MOUSEEV_BUTTON_EVENT:
                         mouse_push_event_button(mousedev->mouse_dev,