Index: kernel/genarch/include/genarch/fb/fb.h =================================================================== --- kernel/genarch/include/genarch/fb/fb.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/fb/fb.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -46,5 +46,5 @@ /** Physical address of the framebuffer device. */ uintptr_t addr; - + /** * Address where the first (top left) pixel is mapped, @@ -52,14 +52,14 @@ */ unsigned int offset; - + /** Screen width in pixels. */ unsigned int x; - + /** Screen height in pixels. */ unsigned int y; - + /** Bytes per one scanline. */ unsigned int scan; - + /** Color model. */ visual_t visual; Index: kernel/genarch/include/genarch/kbrd/kbrd.h =================================================================== --- kernel/genarch/include/genarch/kbrd/kbrd.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/kbrd/kbrd.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -43,8 +43,8 @@ typedef struct { thread_t *thread; - + indev_t *sink; indev_t raw; - + SPINLOCK_DECLARE(keylock); /**< keylock protects keyflags and lockflags. */ volatile unsigned int keyflags; /**< Tracking of multiple keypresses. */ Index: kernel/genarch/include/genarch/ofw/ebus.h =================================================================== --- kernel/genarch/include/genarch/ofw/ebus.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/ebus.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -45,5 +45,5 @@ uint32_t child_base; uint32_t parent_space; - + /* Group phys.mid and phys.lo together */ uint64_t parent_base; Index: kernel/genarch/include/genarch/ofw/ofw_tree.h =================================================================== --- kernel/genarch/include/genarch/ofw/ofw_tree.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/ofw_tree.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -49,12 +49,12 @@ struct ofw_tree_node *peer; struct ofw_tree_node *child; - + phandle node_handle; /**< Old OpenFirmware node handle. */ - + char *da_name; /**< Disambigued name. */ - + size_t properties; /**< Number of properties. */ ofw_tree_property_t *property; - + /** * Pointer to a structure representing respective device. Index: kernel/genarch/include/genarch/ofw/pci.h =================================================================== --- kernel/genarch/include/genarch/ofw/pci.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/pci.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -38,5 +38,5 @@ /* Needs to be masked to obtain pure space id */ uint32_t space; - + /* Group phys.mid and phys.lo together */ uint64_t addr; @@ -46,5 +46,5 @@ typedef struct { uint32_t space; - + /* Group phys.mid and phys.lo together */ uint64_t child_base; Index: kernel/genarch/include/genarch/srln/srln.h =================================================================== --- kernel/genarch/include/genarch/srln/srln.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/srln/srln.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -42,5 +42,5 @@ typedef struct { thread_t *thread; - + indev_t *sink; indev_t raw; Index: kernel/genarch/src/acpi/acpi.c =================================================================== --- kernel/genarch/src/acpi/acpi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/acpi/acpi.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -69,17 +69,17 @@ uint8_t sum = 0; uint32_t i; - + for (i = 0; i < 20; i++) sum = (uint8_t) (sum + _rsdp[i]); - + if (sum) return 0; /* bad checksum */ - + if (rsdp->revision == 0) return 1; /* ACPI 1.0 */ - + for (; i < rsdp->length; i++) sum = (uint8_t) (sum + _rsdp[i]); - + return !sum; } @@ -90,8 +90,8 @@ uint8_t sum = 0; unsigned int i; - + for (i = 0; i < hdr->length; i++) sum = (uint8_t) (sum + sdt[i]); - + return !sum; } @@ -109,5 +109,5 @@ vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt, vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE); - + // TODO: do not leak vtmp @@ -121,5 +121,5 @@ size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint32_t); - + for (i = 0; i < cnt; i++) { for (j = 0; j < sizeof(signature_map) @@ -127,10 +127,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i]; - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -147,5 +147,5 @@ size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint64_t); - + for (i = 0; i < cnt; i++) { for (j = 0; j < sizeof(signature_map) @@ -153,10 +153,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -174,5 +174,5 @@ unsigned int length[2] = { 1024, 128 * 1024 }; uint64_t *sig = (uint64_t *) RSDP_SIGNATURE; - + /* * Find Root System Description Pointer @@ -180,5 +180,5 @@ * 2. search 128K starting at 0xe0000 */ - + addr[0] = (uint8_t *) PA2KA(ebda); for (i = (ebda ? 0 : 1); i < 2; i++) { @@ -191,10 +191,10 @@ } } - + return; - + rsdp_found: LOG("%p: ACPI Root System Description Pointer", acpi_rsdp); - + uintptr_t acpi_rsdt_p = (uintptr_t) acpi_rsdp->rsdt_address; uintptr_t acpi_xsdt_p = 0; @@ -202,23 +202,23 @@ if (acpi_rsdp->revision) acpi_xsdt_p = (uintptr_t) acpi_rsdp->xsdt_address; - + if (acpi_rsdt_p) acpi_rsdt = (struct acpi_rsdt *) map_sdt( (struct acpi_sdt_header *) acpi_rsdt_p); - + if (acpi_xsdt_p) acpi_xsdt = (struct acpi_xsdt *) map_sdt( (struct acpi_sdt_header *) acpi_xsdt_p); - + if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) { log(LF_ARCH, LVL_ERROR, "RSDT: bad checksum"); return; } - + if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) { log(LF_ARCH, LVL_ERROR, "XSDT: bad checksum"); return; } - + if (acpi_xsdt) configure_via_xsdt(); Index: kernel/genarch/src/acpi/madt.c =================================================================== --- kernel/genarch/src/acpi/madt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/acpi/madt.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -83,5 +83,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id; @@ -91,5 +91,5 @@ { assert(i < madt_l_apic_entry_cnt); - + /* * FIXME: The current local APIC driver limits usable @@ -99,5 +99,5 @@ if (i > 7) return false; - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->flags & 0x1; @@ -107,5 +107,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id == @@ -117,5 +117,5 @@ if (irq >= sizeof(isa_irq_map) / sizeof(int)) return (int) irq; - + return isa_irq_map[irq]; } @@ -135,11 +135,11 @@ uint8_t typea = (*((struct madt_apic_header **) a))->type; uint8_t typeb = (*((struct madt_apic_header **) b))->type; - + if (typea > typeb) return 1; - + if (typea < typeb) return -1; - + return 0; } @@ -149,12 +149,12 @@ if (madt_l_apic_entry_cnt == 0) madt_l_apic_entry_index = i; - + madt_l_apic_entry_cnt++; - + if (!(la->flags & 0x1)) { /* Processor is unusable, skip it. */ return; } - + apic_id_mask |= 1 << la->apic_id; } @@ -169,5 +169,5 @@ /* Currently not supported */ } - + madt_io_apic_entry_cnt++; } @@ -177,5 +177,5 @@ { assert(override->source < sizeof(isa_irq_map) / sizeof(int)); - + isa_irq_map[override->source] = override->global_int; } @@ -186,7 +186,7 @@ (((uint8_t *) acpi_madt) + acpi_madt->header.length); struct madt_apic_header *hdr; - + l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address; - + /* Count MADT entries */ unsigned int madt_entries_index_cnt = 0; @@ -194,5 +194,5 @@ hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) madt_entries_index_cnt++; - + /* Create MADT APIC entries index array */ madt_entries_index = (struct madt_apic_header **) @@ -201,7 +201,7 @@ if (!madt_entries_index) panic("Memory allocation error."); - + size_t i = 0; - + for (hdr = acpi_madt->apic_header; hdr < end; hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) { @@ -209,14 +209,14 @@ i++; } - + /* Sort MADT index structure */ if (!gsort(madt_entries_index, madt_entries_index_cnt, sizeof(struct madt_apic_header *), madt_cmp, NULL)) panic("Sorting error."); - + /* Parse MADT entries */ for (i = 0; i < madt_entries_index_cnt; i++) { hdr = madt_entries_index[i]; - + switch (hdr->type) { case MADT_L_APIC: @@ -245,14 +245,14 @@ "MADT: Skipping reserved entry (type=%" PRIu8 ")", hdr->type); - + if (hdr->type >= MADT_RESERVED_OEM_BEGIN) log(LF_ARCH, LVL_NOTE, "MADT: Skipping OEM entry (type=%" PRIu8 ")", hdr->type); - + break; } } - + if (madt_l_apic_entry_cnt > 0) config.cpu_count = madt_l_apic_entry_cnt; Index: kernel/genarch/src/ddi/ddi-bitmap.c =================================================================== --- kernel/genarch/src/ddi/ddi-bitmap.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ddi/ddi-bitmap.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -62,20 +62,20 @@ if (elements > IO_PORTS) return ENOENT; - + if (task->arch.iomap.elements < elements) { /* * The I/O permission bitmap is too small and needs to be grown. */ - + void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); if (!store) return ENOMEM; - + bitmap_t oldiomap; bitmap_initialize(&oldiomap, task->arch.iomap.elements, task->arch.iomap.bits); - + bitmap_initialize(&task->arch.iomap, elements, store); - + /* * Mark the new range inaccessible. @@ -83,5 +83,5 @@ bitmap_set_range(&task->arch.iomap, oldiomap.elements, elements - oldiomap.elements); - + /* * In case there really existed smaller iomap, @@ -91,19 +91,19 @@ bitmap_copy(&task->arch.iomap, &oldiomap, oldiomap.elements); - + free(oldiomap.bits); } } - + /* * Enable the range and we are done. */ bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size); - + /* * Increment I/O Permission bitmap generation counter. */ task->arch.iomapver++; - + return EOK; } @@ -125,5 +125,5 @@ if (elements > IO_PORTS) return ENOENT; - + if (ioaddr >= task->arch.iomap.elements) return EINVAL; @@ -136,10 +136,10 @@ */ bitmap_set_range(&task->arch.iomap, (size_t) ioaddr, size); - + /* * Increment I/O Permission bitmap generation counter. */ task->arch.iomapver++; - + return 0; } Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -50,5 +50,5 @@ dsrlnin_instance_t *instance = irq->instance; dsrlnin_t *dev = instance->dsrlnin; - + indev_push_character(instance->srlnin, pio_read_8(&dev->data)); } @@ -61,5 +61,5 @@ instance->dsrlnin = dev; instance->srlnin = NULL; - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -68,5 +68,5 @@ instance->irq.instance = instance; } - + return instance; } @@ -76,5 +76,5 @@ assert(instance); assert(srlnin); - + instance->srlnin = srlnin; irq_register(&instance->irq); Index: kernel/genarch/src/drivers/dsrln/dsrlnout.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -52,5 +52,5 @@ { dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data; - + if ((!instance->parea.mapped) || (console_override)) { if (ascii_check(ch)) @@ -73,5 +73,5 @@ if (!dsrlndev) return NULL; - + dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t), FRAME_ATOMIC); @@ -80,8 +80,8 @@ return NULL; } - + outdev_initialize("dsrlndev", dsrlndev, &dsrlndev_ops); dsrlndev->data = instance; - + instance->base = base; link_initialize(&instance->parea.link); @@ -91,5 +91,5 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + if (!fb_exported) { /* @@ -101,8 +101,8 @@ sysinfo_set_item_val("fb.kind", NULL, 3); sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(base)); - + fb_exported = true; } - + return dsrlndev; } Index: kernel/genarch/src/drivers/ega/ega.c =================================================================== --- kernel/genarch/src/drivers/ega/ega.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/ega/ega.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -63,7 +63,7 @@ typedef struct { IRQ_SPINLOCK_DECLARE(lock); - + parea_t parea; - + uint32_t cursor; uint8_t *addr; @@ -86,353 +86,353 @@ if ((ch >= 0x0000) && (ch <= 0x007f)) return ch; - + if (ch == 0x00a0) return 255; - + if (ch == 0x00a1) return 173; - + if ((ch >= 0x00a2) && (ch <= 0x00a3)) return (ch - 7); - + if (ch == 0x00a5) return 157; - + if (ch == 0x00aa) return 166; - + if (ch == 0x00ab) return 174; - + if (ch == 0x00ac) return 170; - + if (ch == 0x00b0) return 248; - + if (ch == 0x00b1) return 241; - + if (ch == 0x00b2) return 253; - + if (ch == 0x00b5) return 230; - + if (ch == 0x00b7) return 250; - + if (ch == 0x00ba) return 167; - + if (ch == 0x00bb) return 175; - + if (ch == 0x00bc) return 172; - + if (ch == 0x00bd) return 171; - + if (ch == 0x00bf) return 168; - + if ((ch >= 0x00c4) && (ch <= 0x00c5)) return (ch - 54); - + if (ch == 0x00c6) return 146; - + if (ch == 0x00c7) return 128; - + if (ch == 0x00c9) return 144; - + if (ch == 0x00d1) return 165; - + if (ch == 0x00d6) return 153; - + if (ch == 0x00dc) return 154; - + if (ch == 0x00df) return 225; - + if (ch == 0x00e0) return 133; - + if (ch == 0x00e1) return 160; - + if (ch == 0x00e2) return 131; - + if (ch == 0x00e4) return 132; - + if (ch == 0x00e5) return 134; - + if (ch == 0x00e6) return 145; - + if (ch == 0x00e7) return 135; - + if (ch == 0x00e8) return 138; - + if (ch == 0x00e9) return 130; - + if ((ch >= 0x00ea) && (ch <= 0x00eb)) return (ch - 98); - + if (ch == 0x00ec) return 141; - + if (ch == 0x00ed) return 161; - + if (ch == 0x00ee) return 140; - + if (ch == 0x00ef) return 139; - + if (ch == 0x00f1) return 164; - + if (ch == 0x00f2) return 149; - + if (ch == 0x00f3) return 162; - + if (ch == 0x00f4) return 147; - + if (ch == 0x00f6) return 148; - + if (ch == 0x00f7) return 246; - + if (ch == 0x00f9) return 151; - + if (ch == 0x00fa) return 163; - + if (ch == 0x00fb) return 150; - + if (ch == 0x00fc) return 129; - + if (ch == 0x00ff) return 152; - + if (ch == 0x0192) return 159; - + if (ch == 0x0393) return 226; - + if (ch == 0x0398) return 233; - + if (ch == 0x03a3) return 228; - + if (ch == 0x03a6) return 232; - + if (ch == 0x03a9) return 234; - + if (ch == 0x03b1) return 224; - + if (ch == 0x03b4) return 235; - + if (ch == 0x03b5) return 238; - + if (ch == 0x03c0) return 227; - + if (ch == 0x03c3) return 229; - + if (ch == 0x03c4) return 231; - + if (ch == 0x03c6) return 237; - + if (ch == 0x207f) return 252; - + if (ch == 0x20a7) return 158; - + if (ch == 0x2219) return 249; - + if (ch == 0x221a) return 251; - + if (ch == 0x221e) return 236; - + if (ch == 0x2229) return 239; - + if (ch == 0x2248) return 247; - + if (ch == 0x2261) return 240; - + if (ch == 0x2264) return 243; - + if (ch == 0x2265) return 242; - + if (ch == 0x2310) return 169; - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 8748); - + if (ch == 0x2500) return 196; - + if (ch == 0x2502) return 179; - + if (ch == 0x250c) return 218; - + if (ch == 0x2510) return 191; - + if (ch == 0x2514) return 192; - + if (ch == 0x2518) return 217; - + if (ch == 0x251c) return 195; - + if (ch == 0x2524) return 180; - + if (ch == 0x252c) return 194; - + if (ch == 0x2534) return 193; - + if (ch == 0x253c) return 197; - + if (ch == 0x2550) return 205; - + if (ch == 0x2551) return 186; - + if ((ch >= 0x2552) && (ch <= 0x2553)) return (ch - 9341); - + if (ch == 0x2554) return 201; - + if (ch == 0x2555) return 184; - + if (ch == 0x2556) return 183; - + if (ch == 0x2557) return 187; - + if (ch == 0x2558) return 212; - + if (ch == 0x2559) return 211; - + if (ch == 0x255a) return 200; - + if (ch == 0x255b) return 190; - + if (ch == 0x255c) return 189; - + if (ch == 0x255d) return 188; - + if ((ch >= 0x255e) && (ch <= 0x255f)) return (ch - 9368); - + if (ch == 0x2560) return 204; - + if ((ch >= 0x2561) && (ch <= 0x2562)) return (ch - 9388); - + if (ch == 0x2563) return 185; - + if ((ch >= 0x2564) && (ch <= 0x2565)) return (ch - 9363); - + if (ch == 0x2566) return 203; - + if ((ch >= 0x2567) && (ch <= 0x2568)) return (ch - 9368); - + if (ch == 0x2569) return 202; - + if (ch == 0x256a) return 216; - + if (ch == 0x256b) return 215; - + if (ch == 0x256c) return 206; - + if (ch == 0x2580) return 223; - + if (ch == 0x2584) return 220; - + if (ch == 0x2588) return 219; - + if (ch == 0x258c) return 221; - + if (ch == 0x2590) return 222; - + if ((ch >= 0x2591) && (ch <= 0x2593)) return (ch - 9441); - + return 256; } @@ -445,5 +445,5 @@ if (instance->cursor < EGA_SCREEN) return; - + memmove((void *) instance->backbuf, (void *) (instance->backbuf + EGA_COLS * 2), @@ -451,5 +451,5 @@ memsetw(instance->backbuf + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, EMPTY_CHAR); - + if ((!instance->parea.mapped) || (console_override)) { memmove((void *) instance->addr, @@ -459,5 +459,5 @@ EGA_COLS, EMPTY_CHAR); } - + instance->cursor = instance->cursor - EGA_COLS; } @@ -492,23 +492,23 @@ pio_write_8(instance->base + EGA_INDEX_REG, 0x0f); uint8_t lo = pio_read_8(instance->base + EGA_DATA_REG); - + instance->cursor = (hi << 8) | lo; } else instance->cursor = 0; - + if (instance->cursor >= EGA_SCREEN) instance->cursor = 0; - + if ((instance->cursor % EGA_COLS) != 0) instance->cursor = (instance->cursor + EGA_COLS) - instance->cursor % EGA_COLS; - + memsetw(instance->backbuf + instance->cursor * 2, EGA_SCREEN - instance->cursor, EMPTY_CHAR); - + if ((!instance->parea.mapped) || (console_override)) memsetw(instance->addr + instance->cursor * 2, EGA_SCREEN - instance->cursor, EMPTY_CHAR); - + ega_check_cursor(instance); ega_move_cursor(instance); @@ -521,5 +521,5 @@ uint8_t glyph; uint8_t style; - + if ((index >> 8)) { glyph = U_SPECIAL; @@ -529,8 +529,8 @@ style = STYLE; } - + instance->backbuf[instance->cursor * 2] = glyph; instance->backbuf[instance->cursor * 2 + 1] = style; - + if ((!instance->parea.mapped) || (console_override)) { instance->addr[instance->cursor * 2] = glyph; @@ -542,7 +542,7 @@ { ega_instance_t *instance = (ega_instance_t *) dev->data; - + irq_spinlock_lock(&instance->lock, true); - + switch (ch) { case '\n': @@ -565,5 +565,5 @@ ega_check_cursor(instance); ega_move_cursor(instance); - + irq_spinlock_unlock(&instance->lock, true); } @@ -572,11 +572,11 @@ { ega_instance_t *instance = (ega_instance_t *) dev->data; - + irq_spinlock_lock(&instance->lock, true); - + memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE); ega_move_cursor(instance); ega_show_cursor(instance); - + irq_spinlock_unlock(&instance->lock, true); } @@ -587,5 +587,5 @@ if (!egadev) return NULL; - + ega_instance_t *instance = malloc(sizeof(ega_instance_t), FRAME_ATOMIC); if (!instance) { @@ -593,10 +593,10 @@ return NULL; } - + outdev_initialize("egadev", egadev, &egadev_ops); egadev->data = instance; - + irq_spinlock_initialize(&instance->lock, "*ega.instance.lock"); - + instance->base = base; instance->addr = (uint8_t *) km_map(addr, EGA_VRAM_SIZE, @@ -608,5 +608,5 @@ return NULL; } - + instance->backbuf = (uint8_t *) malloc(EGA_VRAM_SIZE, 0); if (!instance->backbuf) { @@ -616,5 +616,5 @@ return NULL; } - + link_initialize(&instance->parea.link); instance->parea.pbase = addr; @@ -623,9 +623,9 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + /* Synchronize the back buffer and cursor position. */ memcpy(instance->backbuf, instance->addr, EGA_VRAM_SIZE); ega_sync_cursor(instance); - + if (!fb_exported) { /* @@ -640,8 +640,8 @@ sysinfo_set_item_val("fb.blinking", NULL, true); sysinfo_set_item_val("fb.address.physical", NULL, addr); - + fb_exported = true; } - + return egadev; } Index: kernel/genarch/src/drivers/i8042/i8042.c =================================================================== --- kernel/genarch/src/drivers/i8042/i8042.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/i8042/i8042.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -59,5 +59,5 @@ i8042_instance_t *i8042_instance = irq->instance; i8042_t *dev = i8042_instance->i8042; - + if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) return IRQ_ACCEPT; @@ -70,5 +70,5 @@ i8042_instance_t *instance = irq->instance; i8042_t *dev = instance->i8042; - + if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) { uint8_t data = pio_read_8(&dev->data); @@ -83,5 +83,5 @@ if ((pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) == 0) break; - + (void) pio_read_8(&dev->data); delay(50); /* 50 us think time */ @@ -94,8 +94,8 @@ if ((pio_read_8(&dev->status) & i8042_WAIT_MASK) == 0) break; - + delay(50); /* 50 us think time */ } - + pio_write_8(&dev->status, cmd); delay(10000); /* 10 ms think time */ @@ -110,5 +110,5 @@ instance->i8042 = dev; instance->kbrdin = NULL; - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -117,5 +117,5 @@ instance->irq.instance = instance; } - + return instance; } @@ -125,7 +125,7 @@ assert(instance); assert(kbrdin); - + i8042_clear_buffer(instance->i8042); - + instance->kbrdin = kbrdin; irq_register(&instance->irq); Index: kernel/genarch/src/drivers/ns16550/ns16550.c =================================================================== --- kernel/genarch/src/drivers/ns16550/ns16550.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/ns16550/ns16550.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -71,5 +71,5 @@ { ns16550_instance_t *instance = irq->instance; - + while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY) { uint8_t data = ns16550_reg_read(instance, NS16550_REG_RBR); @@ -95,5 +95,5 @@ { ns16550_instance_t *instance = (ns16550_instance_t *) dev->data; - + if ((!instance->parea.mapped) || (console_override)) { if (ascii_check(ch)) @@ -135,5 +135,5 @@ instance->input = NULL; instance->output = NULL; - + if (output) { instance->output = malloc(sizeof(outdev_t), @@ -143,5 +143,5 @@ return NULL; } - + outdev_initialize("ns16550", instance->output, &ns16550_ops); @@ -149,5 +149,5 @@ *output = instance->output; } - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -157,5 +157,5 @@ instance->irq.cir = cir; instance->irq.cir_arg = cir_arg; - + instance->parea.pbase = (uintptr_t) dev; instance->parea.frames = 1; @@ -164,5 +164,5 @@ ddi_parea_register(&instance->parea); } - + return instance; } @@ -172,10 +172,10 @@ assert(instance); assert(input); - + instance->input = input; irq_register(&instance->irq); - + ns16550_clear_buffer(instance); - + /* Enable interrupts */ ns16550_reg_write(instance, NS16550_REG_IER, IER_ERBFI); Index: kernel/genarch/src/drivers/pl050/pl050.c =================================================================== --- kernel/genarch/src/drivers/pl050/pl050.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/pl050/pl050.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -64,5 +64,5 @@ uint8_t status; pl050_instance_t *instance = irq->instance; - + while ((status = pio_read_8(pl050->status)) & PL050_STAT_RXFULL) { data = pio_read_8(pl050->data); @@ -98,5 +98,5 @@ { uint8_t val; - + instance->kbrdin = kbrdin; irq_register(&instance->irq); @@ -108,5 +108,5 @@ /* reset the data buffer */ pio_read_8(pl050->data); - + } Index: kernel/genarch/src/drivers/s3c24xx/uart.c =================================================================== --- kernel/genarch/src/drivers/s3c24xx/uart.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/s3c24xx/uart.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -65,5 +65,5 @@ s3c24xx_uart_t *uart = (s3c24xx_uart_t *) dev->data; - + if ((!uart->parea.mapped) || (console_override)) { if (!ascii_check(ch)) { @@ -134,5 +134,5 @@ pio_write_32(&uart->io->ucon, pio_read_32(&uart->io->ucon) & ~UCON_RX_INT_LEVEL); - + link_initialize(&uart->parea.link); uart->parea.pbase = paddr; @@ -141,5 +141,5 @@ uart->parea.mapped = false; ddi_parea_register(&uart->parea); - + if (!fb_exported) { /* Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -113,5 +113,5 @@ instance->irq.preack = true; } - + return instance; } @@ -239,8 +239,8 @@ cuda_t *dev = instance->cuda; uint8_t b; - + b = pio_read_8(&dev->b); pio_read_8(&dev->sr); - + if ((b & TREQ) == 0) { instance->xstate = cx_receive; @@ -250,5 +250,5 @@ cuda_send_start(instance); } - + memcpy(buf, instance->rcv_buf, instance->bidx); *len = instance->bidx; Index: kernel/genarch/src/fb/bfb.c =================================================================== --- kernel/genarch/src/fb/bfb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/bfb.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -61,5 +61,5 @@ (bfb_bpp == 0) || (bfb_scanline == 0)) return false; - + fb_properties_t bfb_props = { .addr = bfb_addr, @@ -69,5 +69,5 @@ .scan = bfb_scanline }; - + switch (bfb_bpp) { case 8: @@ -92,9 +92,9 @@ return false; } - + outdev_t *fbdev = fb_init(&bfb_props); if (!fbdev) return false; - + stdout_wire(fbdev); return true; Index: kernel/genarch/src/fb/fb.c =================================================================== --- kernel/genarch/src/fb/fb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/fb.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -84,38 +84,38 @@ typedef struct { SPINLOCK_DECLARE(lock); - + parea_t parea; - + uint8_t *addr; uint16_t *backbuf; uint8_t *glyphs; uint8_t *bgscan; - + rgb_conv_t rgb_conv; - + unsigned int xres; unsigned int yres; - + /** Number of rows that fit on framebuffer */ unsigned int rowtrim; - + unsigned int scanline; unsigned int glyphscanline; - + unsigned int pixelbytes; unsigned int glyphbytes; unsigned int bgscanbytes; - + /** Number of columns in the backbuffer */ unsigned int cols; /** Number of rows in the backbuffer */ unsigned int rows; - + /** Starting row in the cyclic backbuffer */ unsigned int start_row; - + /** Top-most visible row (relative to start_row) */ unsigned int offset_row; - + /** Current backbuffer position */ unsigned int position; @@ -236,20 +236,20 @@ if (!overlay) instance->backbuf[BB_POS(instance, col, row)] = glyph; - + /* Do not output if the framebuffer is used by user space */ if ((instance->parea.mapped) && (!console_override)) return; - + /* Check whether the glyph should be visible */ if (row < instance->offset_row) return; - + unsigned int rel_row = row - instance->offset_row; if (rel_row >= instance->rowtrim) return; - + unsigned int x = COL2X(col); unsigned int y = ROW2Y(rel_row); - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) memcpy(&instance->addr[FB_POS(instance, x, y + yd)], @@ -267,22 +267,22 @@ unsigned int y = ROW2Y(rel_row); unsigned int row = rel_row + instance->offset_row; - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) { unsigned int x; unsigned int col; - + for (col = 0, x = 0; col < instance->cols; col++, x += FONT_WIDTH) { uint16_t glyph; - + if (row < instance->rows - 1) { if (instance->backbuf[BB_POS(instance, col, row)] == instance->backbuf[BB_POS(instance, col, row + 1)]) continue; - + glyph = instance->backbuf[BB_POS(instance, col, row + 1)]; } else glyph = 0; - + memcpy(&instance->addr[FB_POS(instance, x, y + yd)], &instance->glyphs[GLYPH_POS(instance, glyph, yd)], @@ -292,14 +292,14 @@ } } - + /* * Implement backbuffer scrolling by wrapping around * the cyclic buffer. */ - + instance->start_row++; if (instance->start_row == instance->rows) instance->start_row = 0; - + memsetw(&instance->backbuf[BB_POS(instance, 0, instance->rows - 1)], instance->cols, 0); @@ -310,5 +310,5 @@ unsigned int col = instance->position % instance->cols; unsigned int row = instance->position / instance->cols; - + glyph_draw(instance, fb_font_glyph(U_CURSOR), col, row, true); } @@ -318,5 +318,5 @@ unsigned int col = instance->position % instance->cols; unsigned int row = instance->position / instance->cols; - + glyph_draw(instance, instance->backbuf[BB_POS(instance, col, row)], col, row, true); @@ -333,18 +333,18 @@ /* Prerender glyphs */ uint16_t glyph; - + for (glyph = 0; glyph < FONT_GLYPHS; glyph++) { uint32_t fg_color; - + if (glyph == FONT_GLYPHS - 1) fg_color = INV_COLOR; else fg_color = FG_COLOR; - + unsigned int y; - + for (y = 0; y < FONT_SCANLINES; y++) { unsigned int x; - + for (x = 0; x < FONT_WIDTH; x++) { void *dst = @@ -357,8 +357,8 @@ } } - + /* Prerender background scanline */ unsigned int x; - + for (x = 0; x < instance->xres; x++) instance->rgb_conv(&instance->bgscan[x * instance->pixelbytes], BG_COLOR); @@ -370,9 +370,9 @@ unsigned int y = ROW2Y(rel_row); unsigned int row = rel_row + instance->offset_row; - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) { unsigned int x; unsigned int col; - + for (col = 0, x = 0; col < instance->cols; col++, x += FONT_WIDTH) { @@ -385,18 +385,18 @@ } } - + if (COL2X(instance->cols) < instance->xres) { unsigned int y; unsigned int size = (instance->xres - COL2X(instance->cols)) * instance->pixelbytes; - + for (y = 0; y < instance->yres; y++) memcpy(&instance->addr[FB_POS(instance, COL2X(instance->cols), y)], instance->bgscan, size); } - + if (ROW2Y(instance->rowtrim) < instance->yres) { unsigned int y; - + for (y = ROW2Y(instance->rowtrim); y < instance->yres; y++) memcpy(&instance->addr[FB_POS(instance, 0, y)], @@ -414,5 +414,5 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + switch (ch) { case '\n': @@ -446,12 +446,12 @@ instance->position++; } - + if (instance->position >= instance->cols * instance->rows) { instance->position -= instance->cols; screen_scroll(instance); } - + cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -464,13 +464,13 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + if (instance->offset_row >= instance->rowtrim / 2) instance->offset_row -= instance->rowtrim / 2; else instance->offset_row = 0; - + fb_redraw_internal(instance); cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -483,5 +483,5 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + if (instance->offset_row + instance->rowtrim / 2 <= instance->rows - instance->rowtrim) @@ -489,8 +489,8 @@ else instance->offset_row = instance->rows - instance->rowtrim; - + fb_redraw_internal(instance); cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -502,5 +502,5 @@ { fb_instance_t *instance = (fb_instance_t *) dev->data; - + spinlock_lock(&instance->lock); fb_redraw_internal(instance); @@ -517,8 +517,8 @@ assert(props->y > 0); assert(props->scan > 0); - + rgb_conv_t rgb_conv; unsigned int pixelbytes; - + switch (props->visual) { case VISUAL_INDIRECT_8: @@ -570,9 +570,9 @@ return NULL; } - + outdev_t *fbdev = malloc(sizeof(outdev_t), FRAME_ATOMIC); if (!fbdev) return NULL; - + fb_instance_t *instance = malloc(sizeof(fb_instance_t), FRAME_ATOMIC); if (!instance) { @@ -580,10 +580,10 @@ return NULL; } - + outdev_initialize("fbdev", fbdev, &fbdev_ops); fbdev->data = instance; - + spinlock_initialize(&instance->lock, "*fb.instance.lock"); - + instance->rgb_conv = rgb_conv; instance->pixelbytes = pixelbytes; @@ -591,22 +591,22 @@ instance->yres = props->y; instance->scanline = props->scan; - + instance->rowtrim = Y2ROW(instance->yres); - + instance->cols = X2COL(instance->xres); instance->rows = FB_PAGES * instance->rowtrim; - + instance->start_row = instance->rows - instance->rowtrim; instance->offset_row = instance->start_row; instance->position = instance->start_row * instance->cols; - + instance->glyphscanline = FONT_WIDTH * instance->pixelbytes; instance->glyphbytes = ROW2Y(instance->glyphscanline); instance->bgscanbytes = instance->xres * instance->pixelbytes; - + size_t fbsize = instance->scanline * instance->yres; size_t bbsize = instance->cols * instance->rows * sizeof(uint16_t); size_t glyphsize = FONT_GLYPHS * instance->glyphbytes; - + instance->addr = (uint8_t *) km_map((uintptr_t) props->addr, fbsize, PAGE_WRITE | PAGE_NOT_CACHEABLE); @@ -617,5 +617,5 @@ return NULL; } - + instance->backbuf = (uint16_t *) malloc(bbsize, 0); if (!instance->backbuf) { @@ -625,5 +625,5 @@ return NULL; } - + instance->glyphs = (uint8_t *) malloc(glyphsize, 0); if (!instance->glyphs) { @@ -634,5 +634,5 @@ return NULL; } - + instance->bgscan = malloc(instance->bgscanbytes, 0); if (!instance->bgscan) { @@ -644,8 +644,8 @@ return NULL; } - + memsetw(instance->backbuf, instance->cols * instance->rows, 0); glyphs_render(instance); - + link_initialize(&instance->parea.link); instance->parea.pbase = props->addr; @@ -654,5 +654,5 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + if (!fb_exported) { /* @@ -668,8 +668,8 @@ sysinfo_set_item_val("fb.visual", NULL, props->visual); sysinfo_set_item_val("fb.address.physical", NULL, props->addr); - + fb_exported = true; } - + fb_redraw(fbdev); return fbdev; Index: kernel/genarch/src/fb/font-8x16.c =================================================================== --- kernel/genarch/src/fb/font-8x16.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/font-8x16.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -47,317 +47,317 @@ if (ch == 0x0000) return 0; - + if ((ch >= 0x0020) && (ch <= 0x007f)) return (ch - 32); - + if ((ch >= 0x00a0) && (ch <= 0x021f)) return (ch - 64); - + if ((ch >= 0x0222) && (ch <= 0x0233)) return (ch - 66); - + if ((ch >= 0x0250) && (ch <= 0x02ad)) return (ch - 94); - + if ((ch >= 0x02b0) && (ch <= 0x02cf)) return (ch - 96); - + if ((ch >= 0x02d8) && (ch <= 0x02dd)) return (ch - 104); - + if (ch == 0x02ee) return 630; - + if ((ch >= 0x0300) && (ch <= 0x0301)) return (ch - 137); - + if (ch == 0x0303) return 633; - + if (ch == 0x0309) return 634; - + if ((ch >= 0x0312) && (ch <= 0x0314)) return (ch - 151); - + if (ch == 0x0323) return 638; - + if ((ch >= 0x0340) && (ch <= 0x0341)) return (ch - 193); - + if ((ch >= 0x0374) && (ch <= 0x0375)) return (ch - 243); - + if (ch == 0x037a) return 643; - + if (ch == 0x037e) return 644; - + if ((ch >= 0x0384) && (ch <= 0x038a)) return (ch - 255); - + if (ch == 0x038c) return 652; - + if ((ch >= 0x038e) && (ch <= 0x03a1)) return (ch - 257); - + if ((ch >= 0x03a3) && (ch <= 0x03ce)) return (ch - 258); - + if ((ch >= 0x03d0) && (ch <= 0x03d7)) return (ch - 259); - + if ((ch >= 0x03da) && (ch <= 0x03f3)) return (ch - 261); - + if ((ch >= 0x0400) && (ch <= 0x0486)) return (ch - 273); - + if ((ch >= 0x0488) && (ch <= 0x04ce)) return (ch - 274); - + if ((ch >= 0x04d0) && (ch <= 0x04f5)) return (ch - 275); - + if ((ch >= 0x04f8) && (ch <= 0x04f9)) return (ch - 277); - + if ((ch >= 0x0500) && (ch <= 0x050f)) return (ch - 283); - + if ((ch >= 0x0530) && (ch <= 0x0556)) return (ch - 315); - + if ((ch >= 0x0559) && (ch <= 0x055f)) return (ch - 317); - + if ((ch >= 0x0561) && (ch <= 0x0587)) return (ch - 318); - + if ((ch >= 0x0589) && (ch <= 0x058a)) return (ch - 319); - + if ((ch >= 0x0591) && (ch <= 0x05a1)) return (ch - 325); - + if ((ch >= 0x05a3) && (ch <= 0x05b9)) return (ch - 326); - + if ((ch >= 0x05bb) && (ch <= 0x05c4)) return (ch - 327); - + if ((ch >= 0x05d0) && (ch <= 0x05ea)) return (ch - 338); - + if ((ch >= 0x05f0) && (ch <= 0x05f4)) return (ch - 343); - + if (ch == 0x060c) return 1182; - + if (ch == 0x061b) return 1183; - + if (ch == 0x061f) return 1184; - + if ((ch >= 0x0621) && (ch <= 0x063a)) return (ch - 384); - + if ((ch >= 0x0640) && (ch <= 0x0655)) return (ch - 389); - + if ((ch >= 0x0660) && (ch <= 0x066d)) return (ch - 399); - + if ((ch >= 0x0670) && (ch <= 0x06ed)) return (ch - 401); - + if ((ch >= 0x06f0) && (ch <= 0x06fe)) return (ch - 403); - + if (ch == 0x10d3) return 1388; - + if (ch == 0x10d7) return 1389; - + if (ch == 0x10da) return 1390; - + if (ch == 0x10dd) return 1391; - + if (ch == 0x10e6) return 1392; - + if ((ch >= 0x1e00) && (ch <= 0x1e9b)) return (ch - 6287); - + if ((ch >= 0x1ea0) && (ch <= 0x1ef9)) return (ch - 6291); - + if ((ch >= 0x1f00) && (ch <= 0x1f07)) return (ch - 6297); - + if ((ch >= 0x2000) && (ch <= 0x2027)) return (ch - 6545); - + if ((ch >= 0x2030) && (ch <= 0x2046)) return (ch - 6553); - + if ((ch >= 0x2048) && (ch <= 0x204d)) return (ch - 6554); - + if (ch == 0x2070) return 1716; - + if ((ch >= 0x2074) && (ch <= 0x208f)) return (ch - 6591); - + if ((ch >= 0x20a0) && (ch <= 0x20af)) return (ch - 6607); - + if ((ch >= 0x2100) && (ch <= 0x213a)) return (ch - 6687); - + if ((ch >= 0x2153) && (ch <= 0x2183)) return (ch - 6711); - + if ((ch >= 0x2190) && (ch <= 0x21f3)) return (ch - 6723); - + if ((ch >= 0x2200) && (ch <= 0x22f1)) return (ch - 6735); - + if (ch == 0x2300) return 2211; - + if (ch == 0x2302) return 2212; - + if ((ch >= 0x2308) && (ch <= 0x230b)) return (ch - 6755); - + if (ch == 0x2310) return 2217; - + if (ch == 0x2318) return 2218; - + if ((ch >= 0x231a) && (ch <= 0x231b)) return (ch - 6767); - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 6771); - + if ((ch >= 0x2329) && (ch <= 0x232a)) return (ch - 6778); - + if ((ch >= 0x239b) && (ch <= 0x23bd)) return (ch - 6890); - + if (ch == 0x23ce) return 2260; - + if ((ch >= 0x2409) && (ch <= 0x240d)) return (ch - 6964); - + if ((ch >= 0x2423) && (ch <= 0x2424)) return (ch - 6985); - + if (ch == 0x2426) return 2268; - + if ((ch >= 0x2500) && (ch <= 0x2595)) return (ch - 7203); - + if ((ch >= 0x25a0) && (ch <= 0x25f7)) return (ch - 7213); - + if ((ch >= 0x2600) && (ch <= 0x2602)) return (ch - 7221); - + if ((ch >= 0x2605) && (ch <= 0x260d)) return (ch - 7223); - + if ((ch >= 0x2610) && (ch <= 0x2613)) return (ch - 7225); - + if (ch == 0x2620) return 2523; - + if (ch == 0x2622) return 2524; - + if (ch == 0x2626) return 2525; - + if ((ch >= 0x2628) && (ch <= 0x262b)) return (ch - 7242); - + if ((ch >= 0x262e) && (ch <= 0x2637)) return (ch - 7244); - + if ((ch >= 0x2639) && (ch <= 0x2653)) return (ch - 7245); - + if ((ch >= 0x2660) && (ch <= 0x2667)) return (ch - 7257); - + if ((ch >= 0x2669) && (ch <= 0x266f)) return (ch - 7258); - + if ((ch >= 0xfb00) && (ch <= 0xfb05)) return (ch - 61674); - + if ((ch >= 0xfb50) && (ch <= 0xfbb1)) return (ch - 61748); - + if ((ch >= 0xfbd3) && (ch <= 0xfbe9)) return (ch - 61781); - + if ((ch >= 0xfbfc) && (ch <= 0xfbff)) return (ch - 61799); - + if ((ch >= 0xfc5b) && (ch <= 0xfc63)) return (ch - 61890); - + if (ch == 0xfc90) return 2722; - + if ((ch >= 0xfcf2) && (ch <= 0xfcf4)) return (ch - 62031); - + if ((ch >= 0xfd3c) && (ch <= 0xfd3f)) return (ch - 62102); - + if (ch == 0xfdf2) return 2730; - + if ((ch >= 0xfe50) && (ch <= 0xfe52)) return (ch - 62373); - + if ((ch >= 0xfe54) && (ch <= 0xfe66)) return (ch - 62374); - + if ((ch >= 0xfe68) && (ch <= 0xfe6b)) return (ch - 62375); - + if ((ch >= 0xfe70) && (ch <= 0xfe72)) return (ch - 62379); - + if (ch == 0xfe74) return 2760; - + if ((ch >= 0xfe76) && (ch <= 0xfefc)) return (ch - 62381); - + if (ch == 0xfeff) return 2896; - + return 2898; } @@ -3262,5 +3262,5 @@ {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8}, {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}, - + /* Special glyph for unknown character */ {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00} Index: kernel/genarch/src/kbrd/kbrd.c =================================================================== --- kernel/genarch/src/kbrd/kbrd.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/kbrd.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -78,5 +78,5 @@ { spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -94,5 +94,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -108,7 +108,7 @@ bool capslock; wchar_t ch; - + spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -126,13 +126,13 @@ capslock = (instance->keyflags & PRESSED_CAPSLOCK) || (instance->lockflags & LOCKED_CAPSLOCK); - + if ((letter) && (capslock)) shift = !shift; - + if (shift) ch = sc_secondary_map[sc]; else ch = sc_primary_map[sc]; - + switch (ch) { case U_PAGE_UP: @@ -145,8 +145,8 @@ indev_push_character(instance->sink, ch); } - - break; - } - + + break; + } + spinlock_unlock(&instance->keylock); } @@ -155,11 +155,11 @@ { kbrd_instance_t *instance = (kbrd_instance_t *) arg; - + while (true) { wchar_t sc = indev_pop_character(&instance->raw); - + if (sc == IGNORE_CODE) continue; - + if (sc & KEY_RELEASE) key_released(instance, (sc ^ KEY_RELEASE) & 0x7f); @@ -176,18 +176,18 @@ instance->thread = thread_create(kkbrd, (void *) instance, TASK, THREAD_FLAG_NONE, "kkbrd"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops); - + spinlock_initialize(&instance->keylock, "kbrd.instance.keylock"); instance->keyflags = 0; instance->lockflags = 0; } - + return instance; } @@ -197,8 +197,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; } Index: kernel/genarch/src/kbrd/kbrd_at.c =================================================================== --- kernel/genarch/src/kbrd/kbrd_at.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/kbrd_at.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -71,5 +71,5 @@ { spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -87,5 +87,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -100,7 +100,7 @@ bool shift; bool capslock; - + spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -118,8 +118,8 @@ capslock = (instance->keyflags & PRESSED_CAPSLOCK) || (instance->lockflags & LOCKED_CAPSLOCK); - + if ((letter) && (capslock)) shift = !shift; - + if (shift) indev_push_character(instance->sink, sc_secondary_map[sc]); @@ -128,5 +128,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -137,5 +137,5 @@ static int is_locked = 0; kbrd_instance_t *instance = (kbrd_instance_t *) arg; - + while (true) { wchar_t sc = indev_pop_character(&instance->raw); @@ -162,5 +162,5 @@ } } - + } } @@ -174,18 +174,18 @@ instance->thread = thread_create(kkbrd, (void *) instance, TASK, 0, "kkbrd"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops); - + spinlock_initialize(&instance->keylock, "kbrd_at.instance.keylock"); instance->keyflags = 0; instance->lockflags = 0; } - + return instance; } @@ -195,8 +195,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; } Index: kernel/genarch/src/kbrd/scanc_pc.c =================================================================== --- kernel/genarch/src/kbrd/scanc_pc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/scanc_pc.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -158,5 +158,5 @@ U_SPECIAL, /* 0x45 - NumLock */ U_SPECIAL, /* 0x46 - ScrollLock */ - + U_HOME_ARROW, /* 0x47 - Home */ U_UP_ARROW, /* 0x48 - Up Arrow */ Index: kernel/genarch/src/mm/as_ht.c =================================================================== --- kernel/genarch/src/mm/as_ht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/as_ht.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -79,5 +79,5 @@ NULL, NULL, SLAB_CACHE_MAGDEFERRED); } - + return NULL; } Index: kernel/genarch/src/mm/as_pt.c =================================================================== --- kernel/genarch/src/mm/as_pt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/as_pt.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -75,5 +75,5 @@ pte_t *dst_ptl0 = (pte_t *) PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, PTL0_SIZE - 1)); - + if (flags & FLAG_AS_KERNEL) memsetb(dst_ptl0, PTL0_SIZE, 0); @@ -82,22 +82,22 @@ * Copy the kernel address space portion to new PTL0. */ - + mutex_lock(&AS_KERNEL->lock); - + pte_t *src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table); - + uintptr_t src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)]; uintptr_t dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)]; - + memsetb(dst_ptl0, PTL0_SIZE, 0); memcpy((void *) dst, (void *) src, PTL0_SIZE - (src - (uintptr_t) src_ptl0)); - + mutex_unlock(&AS_KERNEL->lock); } - + return (pte_t *) KA2PA((uintptr_t) dst_ptl0); } Index: kernel/genarch/src/mm/asid.c =================================================================== --- kernel/genarch/src/mm/asid.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/asid.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -84,5 +84,5 @@ * Check if there is an unallocated ASID. */ - + if (asids_allocated == ASIDS_ALLOCABLE) { @@ -91,5 +91,5 @@ * Resort to stealing. */ - + /* * Remove the first item on the list. @@ -100,5 +100,5 @@ assert(tmp != NULL); list_remove(tmp); - + as = list_get_instance(tmp, as_t, inactive_as_with_asid_link); @@ -115,5 +115,5 @@ */ as->asid = ASID_INVALID; - + /* * If the architecture uses some software cache @@ -122,5 +122,5 @@ */ as_invalidate_translation_cache(as, 0, (size_t) -1); - + /* * Get the system rid of the stolen ASID. @@ -146,5 +146,5 @@ tlb_shootdown_finalize(ipl); } - + return asid; } Index: kernel/genarch/src/mm/asid_fifo.c =================================================================== --- kernel/genarch/src/mm/asid_fifo.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/asid_fifo.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -30,5 +30,5 @@ * @{ */ - + /** * @file @@ -66,5 +66,5 @@ fifo_create(free_asids); #endif - + for (i = 0; i < ASIDS_ALLOCABLE; i++) { fifo_push(free_asids, ASID_START + i); Index: kernel/genarch/src/mm/page_ht.c =================================================================== --- kernel/genarch/src/mm/page_ht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/page_ht.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -135,5 +135,5 @@ { assert(item); - + pte_t *pte = hash_table_get_inst(item, pte_t, link); slab_free(pte_cache, pte); @@ -162,9 +162,9 @@ irq_spinlock_lock(&page_ht_lock, true); - + if (!hash_table_find(&page_ht, key)) { pte_t *pte = slab_alloc(pte_cache, FRAME_LOWMEM | FRAME_ATOMIC); assert(pte != NULL); - + pte->g = (flags & PAGE_GLOBAL) != 0; pte->x = (flags & PAGE_EXEC) != 0; @@ -175,5 +175,5 @@ pte->a = false; pte->d = false; - + pte->as = as; pte->page = ALIGN_DOWN(page, PAGE_SIZE); @@ -185,5 +185,5 @@ */ write_barrier(); - + hash_table_insert(&page_ht, &pte->link); } @@ -210,5 +210,5 @@ assert(page_table_locked(as)); - + irq_spinlock_lock(&page_ht_lock, true); @@ -235,5 +235,5 @@ if (cur) return hash_table_get_inst(cur, pte_t, link); - + return NULL; } @@ -257,5 +257,5 @@ irq_spinlock_unlock(&page_ht_lock, true); - + return t != NULL; } @@ -275,5 +275,5 @@ if (!t) panic("Updating non-existent PTE"); - + assert(pte->as == t->as); assert(pte->page == t->page); Index: kernel/genarch/src/mm/page_pt.c =================================================================== --- kernel/genarch/src/mm/page_pt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/page_pt.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -83,5 +83,5 @@ assert(page_table_locked(as)); - + if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -100,7 +100,7 @@ SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page)); } - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); - + if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -117,7 +117,7 @@ SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page)); } - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); - + if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -134,7 +134,7 @@ SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page)); } - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame); SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT); @@ -165,19 +165,19 @@ * First, remove the mapping, if it exists. */ - + pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table); if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + /* * Destroy the mapping. @@ -189,13 +189,13 @@ SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), PAGE_NOT_PRESENT); memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0); - + /* * Second, free all empty tables along the way from PTL3 down to PTL0 * except those needed for sharing the kernel non-identity mappings. */ - + /* Check PTL3 */ bool empty = true; - + unsigned int i; for (i = 0; i < PTL3_ENTRIES; i++) { @@ -205,5 +205,5 @@ } } - + if (empty) { /* @@ -232,5 +232,5 @@ return; } - + /* Check PTL2, empty is still true */ #if (PTL2_ENTRIES != 0) @@ -241,5 +241,5 @@ } } - + if (empty) { /* @@ -267,5 +267,5 @@ } #endif /* PTL2_ENTRIES != 0 */ - + /* check PTL1, empty is still true */ #if (PTL1_ENTRIES != 0) @@ -276,5 +276,5 @@ } } - + if (empty) { /* @@ -301,5 +301,5 @@ read_barrier(); - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) @@ -312,5 +312,5 @@ read_barrier(); #endif - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) @@ -323,7 +323,7 @@ read_barrier(); #endif - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + return &ptl3[PTL3_INDEX(page)]; } @@ -400,9 +400,9 @@ { assert(size > 0); - + uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table); uintptr_t ptl0_step = ptl0_step_get(); size_t frames; - + #if (PTL1_ENTRIES != 0) frames = PTL1_FRAMES; @@ -412,5 +412,5 @@ frames = PTL3_FRAMES; #endif - + for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1; Index: kernel/genarch/src/multiboot/multiboot.c =================================================================== --- kernel/genarch/src/multiboot/multiboot.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/multiboot/multiboot.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -52,5 +52,5 @@ if (end == NULL) end = cmd_line + str_size(cmd_line); - + /* * Find last occurence of '/' before 'end'. If found, place start at @@ -59,5 +59,5 @@ const char *cp = end; const char *start = buf; - + while (cp != start) { if (*cp == '/') { @@ -67,5 +67,5 @@ cp--; } - + /* Copy the command. */ str_ncpy(buf, size, start, (size_t) (end - start)); @@ -106,8 +106,8 @@ if (init.cnt >= CONFIG_INIT_TASKS) break; - + init.tasks[init.cnt].paddr = mods[i].start; init.tasks[init.cnt].size = mods[i].end - mods[i].start; - + /* Copy command line, if available. */ if (mods[i].string) { @@ -120,5 +120,5 @@ init.tasks[init.cnt].arguments[0] = 0; } - + init.cnt++; } @@ -128,13 +128,13 @@ { uint32_t pos = 0; - + while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) { e820table[e820counter] = memmap->mm_info; - + /* Compute address of next structure. */ uint32_t size = sizeof(memmap->size) + memmap->size; memmap = (multiboot_memmap_t *) ((uintptr_t) memmap + size); pos += size; - + e820counter++; } @@ -163,5 +163,5 @@ multiboot_modules(info->mods_count, (multiboot_module_t *) MULTIBOOT_PTR(info->mods_addr)); - + /* Copy memory map. */ if ((info->flags & MULTIBOOT_INFO_FLAGS_MMAP) != 0) Index: kernel/genarch/src/multiboot/multiboot2.c =================================================================== --- kernel/genarch/src/multiboot/multiboot2.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/multiboot/multiboot2.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -56,5 +56,5 @@ multiboot_extract_argument(init.tasks[init.cnt].arguments, CONFIG_TASK_ARGUMENTS_BUFLEN, module->string); - + init.cnt++; } @@ -66,15 +66,15 @@ ((uintptr_t) memmap + sizeof(*memmap)); uint32_t pos = sizeof(*memmap); - + while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) { e820table[e820counter].base_address = entry->base_address; e820table[e820counter].size = entry->size; e820table[e820counter].type = entry->type; - + /* Compute address of next entry. */ entry = (multiboot2_memmap_entry_t *) ((uintptr_t) entry + memmap->entry_size); pos += memmap->entry_size; - + e820counter++; } @@ -90,11 +90,11 @@ bfb_bpp = fbinfo->bpp; bfb_scanline = fbinfo->scanline; - + bfb_red_pos = fbinfo->rgb.red_pos; bfb_red_size = fbinfo->rgb.red_size; - + bfb_green_pos = fbinfo->rgb.green_pos; bfb_green_size = fbinfo->rgb.green_size; - + bfb_blue_pos = fbinfo->rgb.blue_pos; bfb_blue_size = fbinfo->rgb.blue_size; @@ -116,8 +116,8 @@ if (signature != MULTIBOOT2_LOADER_MAGIC) return; - + const multiboot2_tag_t *tag = (const multiboot2_tag_t *) ALIGN_UP((uintptr_t) info + sizeof(*info), MULTIBOOT2_TAG_ALIGN); - + while (tag->type != MULTIBOOT2_TAG_TERMINATOR) { switch (tag->type) { @@ -135,5 +135,5 @@ break; } - + tag = (const multiboot2_tag_t *) ALIGN_UP((uintptr_t) tag + tag->size, MULTIBOOT2_TAG_ALIGN); Index: kernel/genarch/src/ofw/ebus.c =================================================================== --- kernel/genarch/src/ofw/ebus.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/ebus.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -55,10 +55,10 @@ if (!prop) return false; - + ranges = prop->size / sizeof(ofw_ebus_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if (reg->space != range[i].child_space) @@ -67,10 +67,10 @@ range[i].size)) { ofw_pci_reg_t pci_reg; - + pci_reg.space = range[i].parent_space; pci_reg.addr = range[i].parent_base + (reg->addr - range[i].child_base); pci_reg.size = reg->size; - + return ofw_pci_apply_ranges(node->parent, &pci_reg, pa); } @@ -86,5 +86,5 @@ ofw_tree_property_t *prop; ofw_tree_node_t *controller; - + prop = ofw_tree_getprop(node, "interrupt-map"); if (!prop || !prop->value) @@ -93,19 +93,19 @@ ofw_ebus_intr_map_t *intr_map = prop->value; size_t count = prop->size / sizeof(ofw_ebus_intr_map_t); - + assert(count); - + prop = ofw_tree_getprop(node, "interrupt-map-mask"); if (!prop || !prop->value) return false; - + ofw_ebus_intr_mask_t *intr_mask = prop->value; - + assert(prop->size == sizeof(ofw_ebus_intr_mask_t)); - + uint32_t space = reg->space & intr_mask->space_mask; uint32_t addr = reg->addr & intr_mask->addr_mask; uint32_t intr = interrupt & intr_mask->intr_mask; - + unsigned int i; for (i = 0; i < count; i++) { @@ -127,5 +127,5 @@ if (!controller) return false; - + if (str_cmp(ofw_tree_node_name(controller), "pci") != 0) { /* Index: kernel/genarch/src/ofw/ofw_tree.c =================================================================== --- kernel/genarch/src/ofw/ofw_tree.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/ofw_tree.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -70,5 +70,5 @@ return &node->property[i]; } - + return NULL; } @@ -87,5 +87,5 @@ if ((!prop) || (prop->size < 2)) return NULL; - + return prop->value; } @@ -110,5 +110,5 @@ return cur; } - + /* * Disambigued name not found. @@ -122,5 +122,5 @@ return cur; } - + return NULL; } @@ -141,12 +141,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, dtype) == 0) return cur; } - + return NULL; } @@ -170,5 +170,5 @@ if (cur->node_handle == handle) return cur; - + if (cur->child) { ofw_tree_node_t *node = @@ -178,5 +178,5 @@ } } - + return NULL; } @@ -197,12 +197,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, dtype) == 0) return cur; } - + return NULL; } @@ -223,12 +223,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "name"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, name) == 0) return cur; } - + return NULL; } @@ -246,15 +246,15 @@ if (path[0] != '/') return NULL; - + ofw_tree_node_t *node = ofw_root; size_t j; - + for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) { for (j = i; (j < str_size(path)) && (path[j] != '/'); j++); - + /* Skip extra slashes */ if (i == j) continue; - + char buf[NAME_BUF_LEN + 1]; memcpy(buf, &path[i], j - i); @@ -262,5 +262,5 @@ node = ofw_tree_find_child(node, buf); } - + return node; } @@ -285,5 +285,5 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((prop) && (prop->value) && (str_cmp(prop->value, dtype) == 0)) { bool ret = walker(cur, arg); @@ -291,5 +291,5 @@ return false; } - + if (cur->child) { bool ret = @@ -299,5 +299,5 @@ } } - + return true; } @@ -336,5 +336,5 @@ { ofw_tree_node_t *node = (ofw_tree_node_t *) data; - + /* Compute serialized data size */ *size = 0; @@ -342,8 +342,8 @@ *size += str_size(node->property[i].name) + 1 + sizeof(node->property[i].size) + node->property[i].size; - + if (dry_run) return NULL; - + void *dump = malloc(*size, FRAME_ATOMIC); if (dump == NULL) { @@ -351,5 +351,5 @@ return NULL; } - + /* Serialize the data */ size_t pos = 0; @@ -358,10 +358,10 @@ str_cpy(dump + pos, *size - pos, node->property[i].name); pos += str_size(node->property[i].name) + 1; - + /* Value size */ memcpy(dump + pos, &node->property[i].size, sizeof(node->property[i].size)); pos += sizeof(node->property[i].size); - + /* Value */ memcpy(dump + pos, node->property[i].value, @@ -369,5 +369,5 @@ pos += node->property[i].size; } - + return ((void *) dump); } @@ -385,5 +385,5 @@ { char *cur_path = (char *) malloc(PATH_MAX_LEN, 0); - + for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) { if ((cur->parent) && (path)) @@ -391,12 +391,12 @@ else snprintf(cur_path, PATH_MAX_LEN, "firmware.%s", cur->da_name); - + sysinfo_set_item_gen_data(cur_path, NULL, ofw_sysinfo_properties, (void *) cur); - + if (cur->child) ofw_tree_node_sysinfo(cur->child, cur_path); } - + free(cur_path); } Index: kernel/genarch/src/ofw/pci.c =================================================================== --- kernel/genarch/src/ofw/pci.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/pci.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -63,10 +63,10 @@ return false; } - + ranges = prop->size / sizeof(ofw_pci_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if ((reg->space & PCI_SPACE_MASK) != @@ -95,18 +95,18 @@ return true; } - + ofw_tree_property_t *prop; ofw_pci_reg_t *assigned_address; size_t assigned_addresses; - + prop = ofw_tree_getprop(node, "assigned-addresses"); if (!prop) panic("Cannot find 'assigned-addresses' property."); - + assigned_addresses = prop->size / sizeof(ofw_pci_reg_t); assigned_address = prop->value; - + unsigned int i; - + for (i = 0; i < assigned_addresses; i++) { if ((assigned_address[i].space & PCI_REG_MASK) == @@ -118,5 +118,5 @@ } } - + return false; } Index: kernel/genarch/src/ofw/sbus.c =================================================================== --- kernel/genarch/src/ofw/sbus.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/sbus.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -46,5 +46,5 @@ ofw_sbus_range_t *range; size_t ranges; - + /* * The SBUS support is very rudimentary in that we simply assume @@ -55,14 +55,14 @@ if (!node->parent || node->parent->parent) return false; - + prop = ofw_tree_getprop(node, "ranges"); if (!prop) return false; - + ranges = prop->size / sizeof(ofw_sbus_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if (overlaps(reg->addr, reg->size, range[i].child_base, @@ -73,5 +73,5 @@ } } - + return false; } Index: kernel/genarch/src/softint/division.c =================================================================== --- kernel/genarch/src/softint/division.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/softint/division.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -43,23 +43,23 @@ unsigned int result; int steps = sizeof(unsigned int) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -68,5 +68,5 @@ a <<= 1; } - + return result; } @@ -77,23 +77,23 @@ unsigned long long result; int steps = sizeof(unsigned long long) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -102,5 +102,5 @@ a <<= 1; } - + return result; } @@ -111,8 +111,8 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -123,8 +123,8 @@ unsigned long long rem; long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -149,9 +149,9 @@ unsigned int rem; divandmod32(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((int) rem); - + return (int) rem; } @@ -162,9 +162,9 @@ unsigned long long rem; divandmod64(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((long long) rem); - + return (long long) rem; } @@ -190,10 +190,10 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; @@ -210,10 +210,10 @@ unsigned long long rem; long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; Index: kernel/genarch/src/srln/srln.c =================================================================== --- kernel/genarch/src/srln/srln.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/srln/srln.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -53,16 +53,16 @@ bool cr = false; uint32_t escape = 0; - + while (true) { wchar_t ch = indev_pop_character(&instance->raw); - + /* ANSI escape sequence processing */ if (escape != 0) { escape <<= 8; escape |= ch & 0xff; - + if ((escape == 0x1b4f) || (escape == 0x1b5b) || (escape == 0x1b5b33)) continue; - + switch (escape) { case 0x1b4f46: @@ -100,10 +100,10 @@ } } - + if (ch == 0x1b) { escape = ch & 0xff; continue; } - + /* Replace carriage return with line feed and suppress any following line feed */ @@ -112,5 +112,5 @@ continue; } - + if (ch == '\r') { ch = '\n'; @@ -118,9 +118,9 @@ } else cr = false; - + /* Backspace */ if (ch == 0x7f) ch = '\b'; - + indev_push_character(instance->sink, ch); } @@ -134,14 +134,14 @@ instance->thread = thread_create(ksrln, (void *) instance, TASK, THREAD_FLAG_NONE, "ksrln"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("srln", &instance->raw, &srln_raw_ops); } - + return instance; } @@ -151,8 +151,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; }