Changeset a35b458 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2018-03-02T20:10:49Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/drv/char/i8042/i8042.c (modified) (19 diffs)

uspace/drv/char/i8042/i8042.c

@@ -130 +130 @@
         i8042_t *controller = ddf_dev_data_get(dev);
         errno_t rc;
-        
+
         const uint8_t status = IPC_GET_ARG1(*call);
         const uint8_t data = IPC_GET_ARG2(*call);
-        
+
         i8042_port_t *port = (status & i8042_AUX_DATA) ?
             controller->aux : controller->kbd;
-        
+
         fibril_mutex_lock(&port->buf_lock);
-        
+
         rc = circ_buf_push(&port->cbuf, &data);
         if (rc != EOK)
@@ -169 +169 @@
         ddf_fun_t *aux_fun;
         i8042_regs_t *ar;
-        
+
         errno_t rc;
         bool kbd_bound = false;
         bool aux_bound = false;
-        
+
         if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
                 goto error;
         }
-        
+
         if (pio_enable_range(regs, (void **) &dev->regs) != 0) {
                 rc = EIO;
                 goto error;
         }
-        
+
         kbd_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2a");
         if (kbd_fun == NULL) {
@@ -189 +189 @@
                 goto error;
         };
-        
+
         dev->kbd = ddf_fun_data_alloc(kbd_fun, sizeof(i8042_port_t));
         if (dev->kbd == NULL) {
@@ -195 +195 @@
                 goto error;
         }
-        
+
         dev->kbd->fun = kbd_fun;
         dev->kbd->ctl = dev;
@@ -203 +203 @@
         fibril_mutex_initialize(&dev->kbd->buf_lock);
         fibril_condvar_initialize(&dev->kbd->buf_cv);
-        
+
         rc = ddf_fun_add_match_id(dev->kbd->fun, "char/xtkbd", 90);
         if (rc != EOK)
                 goto error;
-        
+
         aux_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b");
         if (aux_fun == NULL) {
@@ -213 +213 @@
                 goto error;
         }
-        
+
         dev->aux = ddf_fun_data_alloc(aux_fun, sizeof(i8042_port_t));
         if (dev->aux == NULL) {
@@ -219 +219 @@
                 goto error;
         }
-        
+
         dev->aux->fun = aux_fun;
         dev->aux->ctl = dev;
@@ -227 +227 @@
         fibril_mutex_initialize(&dev->aux->buf_lock);
         fibril_condvar_initialize(&dev->aux->buf_cv);
-        
+
         rc = ddf_fun_add_match_id(dev->aux->fun, "char/ps2mouse", 90);
         if (rc != EOK)
                 goto error;
-        
+
         ddf_fun_set_conn_handler(dev->kbd->fun, i8042_char_conn);
         ddf_fun_set_conn_handler(dev->aux->fun, i8042_char_conn);
-        
+
         circ_buf_init(&dev->kbd->cbuf, dev->kbd->buf_data, BUFFER_SIZE, 1);
         circ_buf_init(&dev->aux->cbuf, dev->aux->buf_data, BUFFER_SIZE, 1);
         fibril_mutex_initialize(&dev->write_guard);
-        
+
         rc = ddf_fun_bind(dev->kbd->fun);
         if (rc != EOK) {
@@ -246 +246 @@
         }
         kbd_bound = true;
-        
+
         rc = ddf_fun_bind(dev->aux->fun);
         if (rc != EOK) {
@@ -254 +254 @@
         }
         aux_bound = true;
-        
+
         /* Disable kbd and aux */
         wait_ready(dev);
@@ -260 +260 @@
         wait_ready(dev);
         pio_write_8(&dev->regs->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
-        
+
         /* Flush all current IO */
         while (pio_read_8(&dev->regs->status) & i8042_OUTPUT_FULL)
@@ -280 +280 @@
                 .cmds = cmds
         };
-        
+
         int irq_kbd_cap;
         rc = register_interrupt_handler(ddf_dev, irq_kbd,
@@ -289 +289 @@
                 goto error;
         }
-        
+
         int irq_mouse_cap;
         rc = register_interrupt_handler(ddf_dev, irq_mouse,
@@ -298 +298 @@
                 goto error;
         }
-        
+
         /* Enable interrupts */
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(ddf_dev);
         assert(parent_sess != NULL);
-        
+
         rc = hw_res_enable_interrupt(parent_sess, irq_kbd);
         if (rc != EOK) {
@@ -318 +318 @@
                 goto error;
         }
-        
+
         /* Enable port interrupts. */
         wait_ready(dev);
@@ -325 +325 @@
         pio_write_8(&dev->regs->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
             i8042_AUX_IE);
-        
+
         return EOK;
 error:
@@ -356 +356 @@
         i8042_t *i8042 = port->ctl;
         const char *dp = (const char *)data;
-        
+
         fibril_mutex_lock(&i8042->write_guard);
-        
+
         for (size_t i = 0; i < size; ++i) {
                 if (port == i8042->aux) {
@@ -365 +365 @@
                             i8042_CMD_WRITE_AUX);
                 }
-                
+
                 wait_ready(i8042);
                 pio_write_8(&i8042->regs->data, dp[i]);
         }
-        
+
         fibril_mutex_unlock(&i8042->write_guard);
         *nwr = size;
@@ -392 +392 @@
         uint8_t *destp = (uint8_t *)dest;
         errno_t rc;
-        
+
         fibril_mutex_lock(&port->buf_lock);
-        
+
         while (circ_buf_nused(&port->cbuf) == 0)
                 fibril_condvar_wait(&port->buf_cv, &port->buf_lock);