Changeset 8565a42 in mainline for kernel/arch/ia64/src/drivers

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

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

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/arch/ia64/src/drivers

Files:

• it.c (modified) (4 diffs)
• ski.c (modified) (12 diffs)

kernel/arch/ia64/src/drivers/it.c

@@ -68 +68 @@
                 it_irq.handler = it_interrupt;
                 irq_register(&it_irq);
-                
+
                 uint64_t base_freq;
                 base_freq  = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >>
@@ -75 +75 @@
                 base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >>
                     FREQ_DENOMINATOR_SHIFT;
-                
+
                 it_delta = base_freq / HZ;
         }
-        
+
         /* Initialize Interval Timer external interrupt vector */
         cr_itv_t itv;
-        
+
         itv.value = itv_read();
         itv.vector = INTERRUPT_TIMER;
         itv.m = 0;
         itv_write(itv.value);
-        
+
         /* Set Interval Timer Counter to zero */
         itc_write(0);
-        
+
         /* Generate first Interval Timer interrupt in IT_DELTA ticks */
         itm_write(IT_DELTA);
-        
+
         /* Propagate changes */
         srlz_d();
@@ -113 +113 @@
 {
         eoi_write(EOI);
-        
+
         int64_t itm = itm_read();
-        
+
         while (true) {
                 int64_t itc = itc_read();
                 itc += IT_SERVICE_CLOCKS;
-                
+
                 itm += IT_DELTA;
                 if (itm - itc < 0)
@@ -126 +126 @@
                         break;
         }
-        
+
         itm_write(itm);
         srlz_d();  /* Propagate changes */
-        
+
         /*
          * We are holding a lock which prevents preemption.

kernel/arch/ia64/src/drivers/ski.c

@@ -49 +49 @@
         /** Interval between polling in microseconds */
         POLL_INTERVAL = 10000,  /* 0.01 s */
-        
+
         /** Max. number of characters to pull out at a time */
         POLL_LIMIT = 30,
-        
+
         SKI_INIT_CONSOLE = 20,
         SKI_GETCHAR      = 21,
@@ -82 +82 @@
 {
         uint64_t ch;
-        
+
         asm volatile (
                 "mov r15 = %1\n"
                 "break 0x80000;;\n"  /* modifies r8 */
                 "mov %0 = r8;;\n"
-                
+
                 : "=r" (ch)
                 : "i" (SKI_GETCHAR)
                 : "r15", "r8"
         );
-        
+
         return (wchar_t) ch;
 }
@@ -103 +103 @@
 {
         int count = POLL_LIMIT;
-        
+
         while (count > 0) {
                 wchar_t ch = ski_getchar();
-                
+
                 if (ch == '\0')
                         break;
-                
+
                 indev_push_character(instance->srlnin, ch);
                 --count;
@@ -119 +119 @@
 {
         ski_instance_t *instance = (ski_instance_t *) arg;
-        
+
         while (true) {
                 // TODO FIXME:
@@ -126 +126 @@
                 if (console_override)
                         poll_keyboard(instance);
-                
+
                 thread_usleep(POLL_INTERVAL);
         }
@@ -141 +141 @@
         if (instance)
                 return;
-        
+
         asm volatile (
                 "mov r15 = %0\n"
@@ -149 +149 @@
                 : "r15", "r8"
         );
-        
+
         instance = malloc(sizeof(ski_instance_t), FRAME_ATOMIC);
-        
+
         if (instance) {
                 instance->thread = thread_create(kskipoll, instance, TASK,
                     THREAD_FLAG_UNCOUNTED, "kskipoll");
-                
+
                 if (!instance->thread) {
                         free(instance);
@@ -161 +161 @@
                         return;
                 }
-                
+
                 instance->srlnin = NULL;
         }
@@ -196 +196 @@
                         if (ch == '\n')
                                 ski_do_putchar('\r');
-                        
+
                         ski_do_putchar(ch);
                 } else
@@ -208 +208 @@
         if (!instance)
                 return NULL;
-        
+
         outdev_t *skidev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
         if (!skidev)
                 return NULL;
-        
+
         outdev_initialize("skidev", skidev, &skidev_ops);
         skidev->data = instance;
-        
+
         if (!fb_exported) {
                 /*
@@ -224 +224 @@
                 sysinfo_set_item_val("fb", NULL, true);
                 sysinfo_set_item_val("fb.kind", NULL, 6);
-                
+
                 fb_exported = true;
         }
-        
+
         return skidev;
 }
@@ -241 +241 @@
         assert(instance);
         assert(srlnin);
-        
+
         instance->srlnin = srlnin;
         thread_ready(instance->thread);
-        
+
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);