Changeset a35b458 in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2018-03-02T20:10:49Z (7 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/srv/hid/output/port/ega.c (modified) (10 diffs)

uspace/srv/hid/output/port/ega.c

@@ -47 +47 @@
         sysarg_t cols;
         sysarg_t rows;
-        
+
         uint8_t style_normal;
         uint8_t style_inverted;
-        
+
         size_t size;
         uint8_t *addr;
@@ -60 +60 @@
 {
         uint8_t attr = 0;
-        
+
         switch (attrs.type) {
         case CHAR_ATTR_STYLE:
@@ -81 +81 @@
                 attr = ((attrs.val.index.bgcolor & 7) << 4) |
                     (attrs.val.index.fgcolor & 7);
-                
+
                 if (attrs.val.index.attr & CATTR_BRIGHT)
                         attr |= 0x08;
-                
+
                 break;
         case CHAR_ATTR_RGB:
@@ -91 +91 @@
                 break;
         }
-        
+
         return attr;
 }
@@ -105 +105 @@
 {
         uint8_t glyph;
-        
+
         if (ascii_check(field->ch))
                 glyph = field->ch;
         else
                 glyph = '?';
-        
+
         uint8_t attr = attrs_attr(field->attrs);
-        
+
         ega.addr[FB_POS(col, row)] = glyph;
         ega.addr[FB_POS(col, row) + 1] = attr;
@@ -143 +143 @@
         /* Cursor position */
         uint16_t cursor = row * ega.cols + col;
-        
+
         pio_write_8(EGA_IO_BASE, 0x0e);
         pio_write_8(EGA_IO_BASE + 1, (cursor >> 8) & 0xff);
         pio_write_8(EGA_IO_BASE, 0x0f);
         pio_write_8(EGA_IO_BASE + 1, cursor & 0xff);
-        
+
         /* Cursor visibility */
         pio_write_8(EGA_IO_BASE, 0x0a);
         uint8_t stat = pio_read_8(EGA_IO_BASE + 1);
-        
+
         pio_write_8(EGA_IO_BASE, 0x0a);
-        
+
         if (visible)
                 pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5)));
@@ -165 +165 @@
         charfield_t *field =
             chargrid_charfield_at(dev->backbuf, col, row);
-        
+
         draw_char(field, col, row);
 }
@@ -189 +189 @@
         if (rc != EOK)
                 present = false;
-        
+
         if (!present)
                 return ENOENT;
-        
+
         sysarg_t kind;
         rc = sysinfo_get_value("fb.kind", &kind);
         if (rc != EOK)
                 kind = (sysarg_t) -1;
-        
+
         if (kind != 2)
                 return EINVAL;
-        
+
         sysarg_t paddr;
         rc = sysinfo_get_value("fb.address.physical", &paddr);
         if (rc != EOK)
                 return rc;
-        
+
         rc = sysinfo_get_value("fb.width", &ega.cols);
         if (rc != EOK)
                 return rc;
-        
+
         rc = sysinfo_get_value("fb.height", &ega.rows);
         if (rc != EOK)
                 return rc;
-        
+
         rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL);
         if (rc != EOK)
                 return rc;
-        
+
         ega.size = (ega.cols * ega.rows) << 1;
         ega.addr = AS_AREA_ANY;
-        
+
         rc = physmem_map(paddr,
             ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH,
@@ -226 +226 @@
         if (rc != EOK)
                 return rc;
-        
+
         sysarg_t blinking;
         rc = sysinfo_get_value("fb.blinking", &blinking);
         if (rc != EOK)
                 blinking = false;
-        
+
         ega.style_normal = 0xf0;
         ega.style_inverted = 0x0f;
-        
+
         if (blinking) {
                 ega.style_normal &= 0x77;
                 ega.style_inverted &= 0x77;
         }
-        
+
         outdev_t *dev = outdev_register(&ega_ops, (void *) &ega);
         if (dev == NULL) {
@@ -245 +245 @@
                 return EINVAL;
         }
-        
+
         return EOK;
 }