WebSVN – HelenOS – Path Comparison – / – /branches/dd/kernel/ Rev 4667 and /branches/dd/kernel/ Rev 4668

Ignore whitespace Rev 4667 → Rev 4668

 /branches/dd/kernel/doc/mm
 ,10 → 5,10
 .1 Hierarchical 4-level per address space page tables
-SPARTAN kernel deploys generic interface for 4-level page tables
-for these architectures: amd64, ia32, mips32 and ppc32. In this
-setting, page tables are hierarchical and are not shared by
-address spaces (i.e. one set of page tables per address space).
+SPARTAN kernel deploys generic interface for 4-level page tables for these
+architectures: amd64, arm32, ia32, mips32 and ppc32. In this setting, page
+tables are hierarchical and are not shared by address spaces (i.e. one set of
+page tables per address space).
  VADDR

 /branches/dd/kernel/genarch/include/kbrd/scanc_mac.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup genarch
+ * @{
+ */
+/**
+ * @file
+ * @brief Scan codes for Macintosh ADB keyboards.
+ */
+#ifndef KERN_SCANC_MAC_H_
+#define KERN_SCANC_MAC_H_
+#define SC_LSHIFT       0x38
+#define SC_RSHIFT       0xfd    /* Not used */
+#define SC_CAPSLOCK     0xfe    /* Not used */
+#define SC_SCAN_ESCAPE  0xff    /* Not used */
+#endif
+/** @}
+ */

 /branches/dd/kernel/genarch/include/drivers/via-cuda/cuda.h
 ,14 → 38,80
 #include <ddi/irq.h>
 #include <arch/types.h>
 #include <console/chardev.h>
+#include <synch/spinlock.h>
 typedef struct {
+    uint8_t b;
+    uint8_t pad0[0x1ff];
+    uint8_t a;
+    uint8_t pad1[0x1ff];
+    uint8_t dirb;
+    uint8_t pad2[0x1ff];
+    uint8_t dira;
+    uint8_t pad3[0x1ff];
+    uint8_t t1cl;
+    uint8_t pad4[0x1ff];
+    uint8_t t1ch;
+    uint8_t pad5[0x1ff];
+    uint8_t t1ll;
+    uint8_t pad6[0x1ff];
+    uint8_t t1lh;
+    uint8_t pad7[0x1ff];
+    uint8_t t2cl;
+    uint8_t pad8[0x1ff];
+    uint8_t t2ch;
+    uint8_t pad9[0x1ff];
+    uint8_t sr;
+    uint8_t pad10[0x1ff];
+    uint8_t acr;
+    uint8_t pad11[0x1ff];
+    uint8_t pcr;
+    uint8_t pad12[0x1ff];
+    uint8_t ifr;
+    uint8_t pad13[0x1ff];
+    uint8_t ier;
+    uint8_t pad14[0x1ff];
+    uint8_t anh;
+    uint8_t pad15[0x1ff];
 } cuda_t;
+enum {
+    CUDA_RCV_BUF_SIZE = 5
+};
+enum cuda_xfer_state {
+    cx_listen,
+    cx_receive,
+    cx_rcv_end,
+    cx_send_start,
+    cx_send
+};
 typedef struct {
     irq_t irq;
     cuda_t *cuda;
     indev_t *kbrdin;
+    uint8_t rcv_buf[CUDA_RCV_BUF_SIZE];
+    uint8_t snd_buf[CUDA_RCV_BUF_SIZE];
+    size_t bidx;
+    size_t snd_bytes;
+    enum cuda_xfer_state xstate;
+    SPINLOCK_DECLARE(dev_lock);
 } cuda_instance_t;
 extern cuda_instance_t *cuda_init(cuda_t *, inr_t, cir_t, void *);

 /branches/dd/kernel/genarch/Makefile.inc
 ,6 → 110,12
         genarch/src/kbrd/scanc_sun.c
 endif
+ifeq ($(CONFIG_MAC_KBD),y)
+    GENARCH_SOURCES += \
+        genarch/src/kbrd/kbrd.c \
+        genarch/src/kbrd/scanc_mac.c
+endif
 ifeq ($(CONFIG_SRLN),y)
     GENARCH_SOURCES += \
         genarch/src/srln/srln.c

 /branches/dd/kernel/genarch/src/kbrd/kbrd.c
 ,6 → 45,10
 #include <genarch/kbrd/scanc_sun.h>
 #endif
+#ifdef CONFIG_MAC_KBD
+#include <genarch/kbrd/scanc_mac.h>
+#endif
 #include <synch/spinlock.h>
 #include <console/chardev.h>
 #include <console/console.h>

 /branches/dd/kernel/genarch/src/kbrd/scanc_mac.c
 ,0 → 1,306
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup genarch
+ * @{
+ */
+/**
+ * @file
+ * @brief Scan codes for Macintosh ADB keyboards.
+ */
+#include <genarch/kbrd/scanc.h>
+#include <typedefs.h>
+#include <string.h>
+/** Primary meaning of scancodes. */
+wchar_t sc_primary_map[SCANCODES] = {
+    [0x00] = 'a',
+    [0x01] = 's',
+    [0x02] = 'd',
+    [0x03] = 'f',
+    [0x04] = 'h',
+    [0x05] = 'g',
+    [0x06] = 'z',
+    [0x07] = 'x',
+    [0x08] = 'c',
+    [0x09] = 'v',
+    [0x0a] = U_SPECIAL,
+    [0x0b] = 'b',
+    [0x0c] = 'q',
+    [0x0d] = 'w',
+    [0x0e] = 'e',
+    [0x0f] = 'r',
+    [0x10] = 'y',
+    [0x11] = 't',
+    [0x12] = '1',
+    [0x13] = '2',
+    [0x14] = '3',
+    [0x15] = '4',
+    [0x16] = '6',
+    [0x17] = '5',
+    [0x18] = '=',
+    [0x19] = '9',
+    [0x1a] = '7',
+    [0x1b] = '-',
+    [0x1c] = '8',
+    [0x1d] = '0',
+    [0x1e] = ']',
+    [0x1f] = 'o',
+    [0x20] = 'u',
+    [0x21] = '[',
+    [0x22] = 'i',
+    [0x23] = 'p',
+    [0x24] = '\n',      /* Enter */
+    [0x25] = 'l',
+    [0x26] = 'j',
+    [0x27] = '\'',
+    [0x28] = 'k',
+    [0x29] = ';',
+    [0x2a] = '\\',
+    [0x2b] = ',',
+    [0x2c] = '/',
+    [0x2d] = 'n',
+    [0x2e] = 'm',
+    [0x2f] = '.',
+    [0x30] = '\t',      /* Tab */
+    [0x31] = ' ',       /* Space */
+    [0x32] = '`',
+    [0x33] = '\b',      /* Backspace */
+    [0x34] = U_SPECIAL,
+    [0x35] = U_ESCAPE,
+    [0x36] = U_SPECIAL,
+    [0x37] = U_SPECIAL,
+    [0x38] = U_SPECIAL,
+    [0x39] = U_SPECIAL,
+    [0x3a] = U_SPECIAL,
+    [0x3b] = U_LEFT_ARROW,
+    [0x3c] = U_RIGHT_ARROW,
+    [0x3d] = U_DOWN_ARROW,
+    [0x3e] = U_UP_ARROW,
+    [0x3f] = U_SPECIAL,
+    [0x40] = U_SPECIAL,
+    [0x41] = '.',       /* Num Separator */
+    [0x42] = U_SPECIAL,
+    [0x43] = '*',       /* Num Times */
+    [0x44] = U_SPECIAL,
+    [0x45] = '+',       /* Num Plus */
+    [0x46] = U_SPECIAL,
+    [0x47] = U_SPECIAL,
+    [0x48] = U_SPECIAL,
+    [0x49] = U_SPECIAL,
+    [0x4a] = U_SPECIAL,
+    [0x4b] = '/',       /* Num Divide */
+    [0x4c] = U_SPECIAL,
+    [0x4d] = U_SPECIAL,
+    [0x4e] = '-',       /* Num Minus */
+    [0x4f] = U_SPECIAL,
+    [0x50] = U_SPECIAL,
+    [0x51] = U_SPECIAL,
+    [0x52] = '0',        /* Num Zero */
+    [0x53] = '1',       /* Num One */
+    [0x54] = '2',       /* Num Two */
+    [0x55] = '3',       /* Num Three */
+    [0x56] = '4',       /* Num Four */
+    [0x57] = '5',       /* Num Five */
+    [0x58] = '6',       /* Num Six */
+    [0x59] = '7',       /* Num Seven */
+    [0x5a] = U_SPECIAL,
+    [0x5b] = '8',       /* Num Eight */
+    [0x5c] = '9',       /* Num Nine */
+    [0x5d] = U_SPECIAL,
+    [0x5e] = U_SPECIAL,
+    [0x5f] = U_SPECIAL,
+    [0x60] = U_SPECIAL,
+    [0x61] = U_SPECIAL,
+    [0x62] = U_SPECIAL,
+    [0x63] = U_SPECIAL,
+    [0x64] = U_SPECIAL,
+    [0x65] = U_SPECIAL,
+    [0x66] = U_SPECIAL,
+    [0x67] = U_SPECIAL,
+    [0x68] = U_SPECIAL,
+    [0x69] = U_SPECIAL,
+    [0x6a] = U_SPECIAL,
+    [0x6b] = U_SPECIAL,
+    [0x6c] = U_SPECIAL,
+    [0x6d] = U_SPECIAL,
+    [0x6e] = U_SPECIAL,
+    [0x6f] = U_SPECIAL,
+    [0x70] = U_SPECIAL,
+    [0x71] = U_SPECIAL,
+    [0x72] = U_SPECIAL,
+    [0x73] = U_HOME_ARROW,
+    [0x74] = U_PAGE_UP,
+    [0x75] = U_DELETE,
+    [0x76] = U_SPECIAL,
+    [0x77] = U_SPECIAL,
+    [0x78] = U_SPECIAL,
+    [0x79] = U_PAGE_DOWN,
+    [0x7a] = U_SPECIAL,
+    [0x7b] = U_SPECIAL,
+    [0x7c] = U_SPECIAL,
+    [0x7d] = U_SPECIAL,
+    [0x7e] = U_SPECIAL,
+    [0x7f] = U_SPECIAL
+};
+/** Secondary meaning of scancodes. */
+wchar_t sc_secondary_map[SCANCODES] = {
+    [0x00] = 'A',
+    [0x01] = 'S',
+    [0x02] = 'D',
+    [0x03] = 'F',
+    [0x04] = 'H',
+    [0x05] = 'G',
+    [0x06] = 'Z',
+    [0x07] = 'X',
+    [0x08] = 'C',
+    [0x09] = 'V',
+    [0x0a] = U_SPECIAL,
+    [0x0b] = 'B',
+    [0x0c] = 'Q',
+    [0x0d] = 'W',
+    [0x0e] = 'E',
+    [0x0f] = 'R',
+    [0x10] = 'Y',
+    [0x11] = 'T',
+    [0x12] = '!',
+    [0x13] = '@',
+    [0x14] = '#',
+    [0x15] = '$',
+    [0x16] = '^',
+    [0x17] = '%',
+    [0x18] = '+',
+    [0x19] = '(',
+    [0x1a] = '&',
+    [0x1b] = '_',
+    [0x1c] = '*',
+    [0x1d] = ')',
+    [0x1e] = '}',
+    [0x1f] = 'O',
+    [0x20] = 'U',
+    [0x21] = '{',
+    [0x22] = 'I',
+    [0x23] = 'P',
+    [0x24] = '\n',      /* Enter */
+    [0x25] = 'L',
+    [0x26] = 'J',
+    [0x27] = '"',
+    [0x28] = 'K',
+    [0x29] = ':',
+    [0x2a] = '|',
+    [0x2b] = '<',
+    [0x2c] = '?',
+    [0x2d] = 'N',
+    [0x2e] = 'M',
+    [0x2f] = '>',
+    [0x30] = '\t',      /* Tab */
+    [0x31] = ' ',       /* Space */
+    [0x32] = '~',
+    [0x33] = '\b',      /* Backspace */
+    [0x34] = U_SPECIAL,
+    [0x35] = U_SPECIAL,
+    [0x36] = U_SPECIAL,
+    [0x37] = U_SPECIAL,
+    [0x38] = U_SPECIAL,
+    [0x39] = U_SPECIAL,
+    [0x3a] = U_SPECIAL,
+    [0x3b] = U_SPECIAL,
+    [0x3c] = U_SPECIAL,
+    [0x3d] = U_SPECIAL,
+    [0x3e] = U_SPECIAL,
+    [0x3f] = U_SPECIAL,
+    [0x40] = U_SPECIAL,
+    [0x41] = '.',       /* Num Separator */
+    [0x42] = U_SPECIAL,
+    [0x43] = '*',       /* Num Times */
+    [0x44] = U_SPECIAL,
+    [0x45] = '+',       /* Num Plus */
+    [0x46] = U_SPECIAL,
+    [0x47] = U_SPECIAL,
+    [0x48] = U_SPECIAL,
+    [0x49] = U_SPECIAL,
+    [0x4a] = U_SPECIAL,
+    [0x4b] = '/',       /* Num Divide */
+    [0x4c] = U_SPECIAL,
+    [0x4d] = U_SPECIAL,
+    [0x4e] = '-',       /* Num Minus */
+    [0x4f] = U_SPECIAL,
+    [0x50] = U_SPECIAL,
+    [0x51] = U_SPECIAL,
+    [0x52] = '0',        /* Num Zero */
+    [0x53] = '1',       /* Num One */
+    [0x54] = '2',       /* Num Two */
+    [0x55] = '3',       /* Num Three */
+    [0x56] = '4',       /* Num Four */
+    [0x57] = '5',       /* Num Five */
+    [0x58] = '6',       /* Num Six */
+    [0x59] = '7',       /* Num Seven */
+    [0x5a] = U_SPECIAL,
+    [0x5b] = '8',       /* Num Eight */
+    [0x5c] = '9',       /* Num Nine */
+    [0x5d] = U_SPECIAL,
+    [0x5e] = U_SPECIAL,
+    [0x5f] = U_SPECIAL,
+    [0x60] = U_SPECIAL,
+    [0x61] = U_SPECIAL,
+    [0x62] = U_SPECIAL,
+    [0x63] = U_SPECIAL,
+    [0x64] = U_SPECIAL,
+    [0x65] = U_SPECIAL,
+    [0x66] = U_SPECIAL,
+    [0x67] = U_SPECIAL,
+    [0x68] = U_SPECIAL,
+    [0x69] = U_SPECIAL,
+    [0x6a] = U_SPECIAL,
+    [0x6b] = U_SPECIAL,
+    [0x6c] = U_SPECIAL,
+    [0x6d] = U_SPECIAL,
+    [0x6e] = U_SPECIAL,
+    [0x6f] = U_SPECIAL,
+    [0x70] = U_SPECIAL,
+    [0x71] = U_SPECIAL,
+    [0x72] = U_SPECIAL,
+    [0x73] = U_SPECIAL,
+    [0x74] = U_SPECIAL,
+    [0x75] = U_SPECIAL,
+    [0x76] = U_SPECIAL,
+    [0x77] = U_SPECIAL,
+    [0x78] = U_SPECIAL,
+    [0x79] = U_SPECIAL,
+    [0x7a] = U_SPECIAL,
+    [0x7b] = U_SPECIAL,
+    [0x7c] = U_SPECIAL,
+    [0x7d] = U_SPECIAL,
+    [0x7e] = U_SPECIAL,
+    [0x7f] = U_SPECIAL
+};
+/** @}
+ */

 /branches/dd/kernel/genarch/src/mm/page_ht.c
 ,6 → 192,8
         t->k = !(flags & PAGE_USER);
         t->c = (flags & PAGE_CACHEABLE) != 0;
         t->p = !(flags & PAGE_NOT_PRESENT);
+        t->a = false;
+        t->d = false;
         t->as = as;
         t->page = ALIGN_DOWN(page, PAGE_SIZE);

 /branches/dd/kernel/genarch/src/acpi/acpi.c
 ,10 → 167,13
     LOG("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
     acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
-    if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);
+    if (acpi_rsdp->revision)
+        acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);
-    if (acpi_rsdt) map_sdt((struct acpi_sdt_header *) acpi_rsdt);
-    if (acpi_xsdt) map_sdt((struct acpi_sdt_header *) acpi_xsdt);
+    if (acpi_rsdt)
+        map_sdt((struct acpi_sdt_header *) acpi_rsdt);
+    if (acpi_xsdt)
+        map_sdt((struct acpi_sdt_header *) acpi_xsdt);
     if (acpi_rsdt && !acpi_sdt_check((uint8_t *) acpi_rsdt)) {
         printf("RSDT: bad checksum\n");
 ,8 → 184,10
         return;
     }
-    if (acpi_xsdt) configure_via_xsdt();
-    else if (acpi_rsdt) configure_via_rsdt();
+    if (acpi_xsdt)
+        configure_via_xsdt();
+    else if (acpi_rsdt)
+        configure_via_rsdt();
 }

 /branches/dd/kernel/genarch/src/drivers/via-cuda/cuda.c
 ,5 → 1,6
 /*
  * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2009 Jiri Svoboda
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,16 → 39,53
 #include <arch/asm.h>
 #include <mm/slab.h>
 #include <ddi/device.h>
+#include <synch/spinlock.h>
-static irq_ownership_t cuda_claim(irq_t *irq)
-{
-    return IRQ_DECLINE;
-}
+static irq_ownership_t cuda_claim(irq_t *irq);
+static void cuda_irq_handler(irq_t *irq);
-static void cuda_irq_handler(irq_t *irq)
-{
-}
+static void cuda_irq_listen(irq_t *irq);
+static void cuda_irq_receive(irq_t *irq);
+static void cuda_irq_rcv_end(irq_t *irq, void *buf, size_t *len);
+static void cuda_irq_send_start(irq_t *irq);
+static void cuda_irq_send(irq_t *irq);
+static void cuda_packet_handle(cuda_instance_t *instance, uint8_t *buf, size_t len);
+static void cuda_send_start(cuda_instance_t *instance);
+static void cuda_autopoll_set(cuda_instance_t *instance, bool enable);
+/** B register fields */
+enum {
+    TREQ    = 0x08,
+    TACK    = 0x10,
+    TIP = 0x20
+};
+/** IER register fields */
+enum {
+    IER_CLR = 0x00,
+    IER_SET = 0x80,
+    SR_INT  = 0x04,
+    ALL_INT = 0x7f
+};
+/** ACR register fields */
+enum {
+    SR_OUT  = 0x10
+};
+/** Packet types */
+enum {
+    PT_ADB  = 0x00,
+    PT_CUDA = 0x01
+};
+/** CUDA packet types */
+enum {
+    CPT_AUTOPOLL    = 0x01
+};
 cuda_instance_t *cuda_init(cuda_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
     cuda_instance_t *instance
 ,7 → 93,15
     if (instance) {
         instance->cuda = dev;
         instance->kbrdin = NULL;
+        instance->xstate = cx_listen;
+        instance->bidx = 0;
+        instance->snd_bytes = 0;
+        spinlock_initialize(&instance->dev_lock, "cuda_dev");
+        /* Disable all interrupts from CUDA. */
+        pio_write_8(&dev->ier, IER_CLR | ALL_INT);
         irq_initialize(&instance->irq);
         instance->irq.devno = device_assign_devno();
         instance->irq.inr = inr;
 ,15 → 110,251
         instance->irq.instance = instance;
         instance->irq.cir = cir;
         instance->irq.cir_arg = cir_arg;
+        instance->irq.preack = true;
     }
     return instance;
 }
+#include <print.h>
 void cuda_wire(cuda_instance_t *instance, indev_t *kbrdin)
 {
+    cuda_t *dev = instance->cuda;
+    ASSERT(instance);
+    ASSERT(kbrdin);
+    instance->kbrdin = kbrdin;
+    irq_register(&instance->irq);
+    /* Enable SR interrupt. */
+    pio_write_8(&dev->ier, TIP | TREQ);
+    pio_write_8(&dev->ier, IER_SET | SR_INT);
+    /* Enable ADB autopolling. */
+    cuda_autopoll_set(instance, true);
 }
+static irq_ownership_t cuda_claim(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    uint8_t ifr;
+    spinlock_lock(&instance->dev_lock);
+    ifr = pio_read_8(&dev->ifr);
+    spinlock_unlock(&instance->dev_lock);
+    if ((ifr & SR_INT) == 0)
+        return IRQ_DECLINE;
+    return IRQ_ACCEPT;
+}
+static void cuda_irq_handler(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    uint8_t rbuf[CUDA_RCV_BUF_SIZE];
+    size_t len;
+    bool handle;
+    handle = false;
+    len = 0;
+    spinlock_lock(&instance->dev_lock);
+    /* Lower IFR.SR_INT so that CUDA can generate next int by raising it. */
+    pio_write_8(&instance->cuda->ifr, SR_INT);
+    switch (instance->xstate) {
+    case cx_listen: cuda_irq_listen(irq); break;
+    case cx_receive: cuda_irq_receive(irq); break;
+    case cx_rcv_end: cuda_irq_rcv_end(irq, rbuf, &len);
+        handle = true; break;
+    case cx_send_start: cuda_irq_send_start(irq); break;
+    case cx_send: cuda_irq_send(irq); break;
+    }
+    spinlock_unlock(&instance->dev_lock);
+    /* Handle an incoming packet. */
+    if (handle)
+        cuda_packet_handle(instance, rbuf, len);
+}
+/** Interrupt in listen state.
+ *
+ * Start packet reception.
+ */
+static void cuda_irq_listen(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    uint8_t b;
+    b = pio_read_8(&dev->b);
+    if ((b & TREQ) != 0) {
+        printf("cuda_irq_listen: no TREQ?!\n");
+        return;
+    }
+    pio_read_8(&dev->sr);
+    pio_write_8(&dev->b, pio_read_8(&dev->b) & ~TIP);
+    instance->xstate = cx_receive;
+}
+/** Interrupt in receive state.
+ *
+ * Receive next byte of packet.
+ */
+static void cuda_irq_receive(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    uint8_t b, data;
+    data = pio_read_8(&dev->sr);
+    if (instance->bidx < CUDA_RCV_BUF_SIZE)
+        instance->rcv_buf[instance->bidx++] = data;
+    b = pio_read_8(&dev->b);
+    if ((b & TREQ) == 0) {
+        pio_write_8(&dev->b, b ^ TACK);
+    } else {
+        pio_write_8(&dev->b, b | TACK | TIP);
+        instance->xstate = cx_rcv_end;
+    }
+}
+/** Interrupt in rcv_end state.
+ *
+ * Terminate packet reception. Either go back to listen state or start
+ * receiving another packet if CUDA has one for us.
+ */
+static void cuda_irq_rcv_end(irq_t *irq, void *buf, size_t *len)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    uint8_t data, b;
+    b = pio_read_8(&dev->b);
+    data = pio_read_8(&dev->sr);
+    if ((b & TREQ) == 0) {
+        instance->xstate = cx_receive;
+        pio_write_8(&dev->b, b & ~TIP);
+    } else {
+        instance->xstate = cx_listen;
+        cuda_send_start(instance);
+    }
+        memcpy(buf, instance->rcv_buf, instance->bidx);
+        *len = instance->bidx;
+    instance->bidx = 0;
+}
+/** Interrupt in send_start state.
+ *
+ * Process result of sending first byte (and send second on success).
+ */
+static void cuda_irq_send_start(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    uint8_t b;
+    b = pio_read_8(&dev->b);
+    if ((b & TREQ) == 0) {
+        /* Collision */
+        pio_write_8(&dev->acr, pio_read_8(&dev->acr) & ~SR_OUT);
+        pio_read_8(&dev->sr);
+        pio_write_8(&dev->b, pio_read_8(&dev->b) | TIP | TACK);
+        instance->xstate = cx_listen;
+        return;
+    }
+    pio_write_8(&dev->sr, instance->snd_buf[1]);
+    pio_write_8(&dev->b, pio_read_8(&dev->b) ^ TACK);
+    instance->bidx = 2;
+    instance->xstate = cx_send;
+}
+/** Interrupt in send state.
+ *
+ * Send next byte or terminate transmission.
+ */
+static void cuda_irq_send(irq_t *irq)
+{
+    cuda_instance_t *instance = irq->instance;
+    cuda_t *dev = instance->cuda;
+    if (instance->bidx < instance->snd_bytes) {
+        /* Send next byte. */
+        pio_write_8(&dev->sr, instance->snd_buf[instance->bidx++]);
+        pio_write_8(&dev->b, pio_read_8(&dev->b) ^ TACK);
+        return;
+    }
+    /* End transfer. */
+    instance->snd_bytes = 0;
+    instance->bidx = 0;
+    pio_write_8(&dev->acr, pio_read_8(&dev->acr) & ~SR_OUT);
+    pio_read_8(&dev->sr);
+    pio_write_8(&dev->b, pio_read_8(&dev->b) | TACK | TIP);
+    instance->xstate = cx_listen;
+    /* TODO: Match reply with request. */
+}
+static void cuda_packet_handle(cuda_instance_t *instance, uint8_t *data, size_t len)
+{
+    if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c
+        && data[2] != 0x8c))
+        return;
+    /* The packet contains one or two scancodes. */
+    if (data[3] != 0xff)
+        indev_push_character(instance->kbrdin, data[3]);
+    if (data[4] != 0xff)
+        indev_push_character(instance->kbrdin, data[4]);
+}
+static void cuda_autopoll_set(cuda_instance_t *instance, bool enable)
+{
+    instance->snd_buf[0] = PT_CUDA;
+    instance->snd_buf[1] = CPT_AUTOPOLL;
+    instance->snd_buf[2] = enable ? 0x01 : 0x00;
+    instance->snd_bytes = 3;
+    instance->bidx = 0;
+    cuda_send_start(instance);
+}
+static void cuda_send_start(cuda_instance_t *instance)
+{
+    cuda_t *dev = instance->cuda;
+    ASSERT(instance->xstate == cx_listen);
+    if (instance->snd_bytes == 0)
+        return;
+    /* Check for incoming data. */
+    if ((pio_read_8(&dev->b) & TREQ) == 0)
+        return;
+    pio_write_8(&dev->acr, pio_read_8(&dev->acr) | SR_OUT);
+    pio_write_8(&dev->sr, instance->snd_buf[0]);
+    pio_write_8(&dev->b, pio_read_8(&dev->b) & ~TIP);
+    instance->xstate = cx_send_start;
+}
 /** @}
  */

 /branches/dd/kernel/generic/include/byteorder.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup generic
+/** @addtogroup generic
  * @{
  */
 /** @file
 ,48 → 35,47
 #ifndef KERN_BYTEORDER_H_
 #define KERN_BYTEORDER_H_
-#include <arch/byteorder.h>
 #include <arch/types.h>
-#if !(defined(ARCH_IS_BIG_ENDIAN) ^ defined(ARCH_IS_LITTLE_ENDIAN))
-#error The architecture must be either big-endian or little-endian.
+#if !(defined(__BE__) ^ defined(__LE__))
+    #error The architecture must be either big-endian or little-endian.
 #endif
-#ifdef ARCH_IS_BIG_ENDIAN
+#ifdef __BE__
-#define uint16_t_le2host(n)     uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)     uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)     uint64_t_byteorder_swap(n)
+#define uint16_t_le2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_le2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_le2host(n)  (uint64_t_byteorder_swap(n))
-#define uint16_t_be2host(n)     (n)
-#define uint32_t_be2host(n)     (n)
-#define uint64_t_be2host(n)     (n)
+#define uint16_t_be2host(n)  (n)
+#define uint32_t_be2host(n)  (n)
+#define uint64_t_be2host(n)  (n)
-#define host2uint16_t_le(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_le(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_le(n)     uint64_t_byteorder_swap(n)
+#define host2uint16_t_le(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_le(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_le(n)  (uint64_t_byteorder_swap(n))
-#define host2uint16_t_be(n)     (n)
-#define host2uint32_t_be(n)     (n)
-#define host2uint64_t_be(n)     (n)
+#define host2uint16_t_be(n)  (n)
+#define host2uint32_t_be(n)  (n)
+#define host2uint64_t_be(n)  (n)
 #else
-#define uint16_t_le2host(n)     (n)
-#define uint32_t_le2host(n)     (n)
-#define uint64_t_le2host(n)     (n)
+#define uint16_t_le2host(n)  (n)
+#define uint32_t_le2host(n)  (n)
+#define uint64_t_le2host(n)  (n)
-#define uint16_t_be2host(n)     uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)     uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)     uint64_t_byteorder_swap(n)
+#define uint16_t_be2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_be2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_be2host(n)  (uint64_t_byteorder_swap(n))
-#define host2uint16_t_le(n)     (n)
-#define host2uint32_t_le(n)     (n)
-#define host2uint64_t_le(n)     (n)
+#define host2uint16_t_le(n)  (n)
+#define host2uint32_t_le(n)  (n)
+#define host2uint64_t_le(n)  (n)
-#define host2uint16_t_be(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_be(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_be(n)     uint64_t_byteorder_swap(n)
+#define host2uint16_t_be(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_be(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_be(n)  (uint64_t_byteorder_swap(n))
 #endif

 /branches/dd/kernel/generic/include/string.h
 ,8 → 57,6
 #define U_CURSOR       0x2588
-#define U_BOM          0xfeff
 /**< No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)

 /branches/dd/kernel/generic/include/context.h
 ,7 → 45,7
     (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
 #endif /* context_set */
-extern int context_save_arch(context_t *c);
+extern int context_save_arch(context_t *c) __attribute__ ((returns_twice));
 extern void context_restore_arch(context_t *c) __attribute__ ((noreturn));
 /** Save register context.
 ,10 → 76,6
  * corresponding call to context_save(), the only
  * difference being return value.
  *
- * Note that content of any local variable defined by
- * the caller of context_save() is undefined after
- * context_restore().
- *
  * @param c Context structure.
  */
 static inline void context_restore(context_t *c)

 /branches/dd/kernel/generic/src/main/uinit.c
 ,6 → 79,14
     uarg.uspace_thread_arg = NULL;
     free((uspace_arg_t *) arg);
+    /*
+     * Disable interrupts so that the execution of userspace() is not
+     * disturbed by any interrupts as some of the userspace()
+     * implementations will switch to the userspace stack before switching
+     * the mode.
+     */
+    (void) interrupts_disable();
     userspace(&uarg);
 }

 /branches/dd/kernel/generic/src/printf/printf_core.c
 ,9 → 302,6
     if (str == NULL)
         return printf_putstr(nullstr, ps);
-    if (*str == U_BOM)
-        str++;
     /* Print leading spaces. */
     size_t strw = wstr_length(str);
     if (precision == 0)

 /branches/dd/kernel/Makefile
 ,12 → 44,12
 ## Common compiler flags
 #
-DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
-    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32 -finput-charset=UTF-8 \
-    -fno-builtin -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
-    -nostdlib -nostdinc -pipe
+    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+    -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
+    -Wmissing-prototypes -Werror -nostdlib -nostdinc -pipe
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     -fno-builtin -Wall -Wmissing-prototypes -Werror \

/branches/dd/kernel/arch/sparc64/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/sparc64/include/atomic.h
 ,7 → 123,7
         "ldx %0, %2\n"
         "brz %2, 0b\n"
         "nop\n"
-        "ba %xcc, 1b\n"
+        "ba %%xcc, 1b\n"
         "nop\n"
     "2:\n"
         : "+m" (*((uint64_t *) x)), "+r" (tmp1), "+r" (tmp2) : "r" (0)

 /branches/dd/kernel/arch/sparc64/include/context.h
 ,7 → 39,7
 #include <arch/types.h>
 #include <align.h>
-#define SP_DELTA    STACK_WINDOW_SAVE_AREA_SIZE
+#define SP_DELTA    (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 #ifdef context_set
 #undef context_set

 /branches/dd/kernel/arch/sparc64/Makefile.inc
 ,7 → 40,8
 LFLAGS += -no-check-sections -N
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = BE
 ifeq ($(PROCESSOR),us)
     DEFS += -DUS

 /branches/dd/kernel/arch/sparc64/src/asm.S
 ,7 → 277,7
  */
 .global switch_to_userspace
 switch_to_userspace:
-    save %o1, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
+    save %o1, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
     flushw
     wrpr %g0, 0, %cleanwin      ! avoid information leak

/branches/dd/kernel/arch/ia64/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/ia64/include/atomic.h
 ,12 → 52,12
     return v;
 }
-static inline uint64_t test_and_set(atomic_t *val) {
+static inline uint64_t test_and_set(atomic_t *val)
+{
     uint64_t v;
     asm volatile (
-        "movl %0 = 0x01;;\n"
+        "movl %0 = 0x1;;\n"
         "xchg8 %0 = %1, %0;;\n"
         : "=r" (v), "+m" (val->count)
     );
 ,6 → 65,13
     return v;
 }
+static inline void atomic_lock_arch(atomic_t *val)
+{
+    do {
+        while (val->count)
+            ;
+    } while (test_and_set(val));
+}
 static inline void atomic_inc(atomic_t *val)
 {

/branches/dd/kernel/arch/ia64/include/mm/tlb.h
92,6 → 92,7
extern void data_dirty_bit_fault(uint64_t vector, istate_t *istate);
extern void instruction_access_bit_fault(uint64_t vector, istate_t *istate);
extern void data_access_bit_fault(uint64_t vector, istate_t *istate);
extern void data_access_rights_fault(uint64_t vector, istate_t *istate);
extern void page_not_present(uint64_t vector, istate_t *istate);

#endif

 /branches/dd/kernel/arch/ia64/Makefile.inc
 ,7 → 41,8
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = LE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/start.S \

 /branches/dd/kernel/arch/ia64/src/ivt.S
 ,7 → 536,7
     HEAVYWEIGHT_HANDLER 0x5000 page_not_present
     HEAVYWEIGHT_HANDLER 0x5100
     HEAVYWEIGHT_HANDLER 0x5200
-    HEAVYWEIGHT_HANDLER 0x5300
+    HEAVYWEIGHT_HANDLER 0x5300 data_access_rights_fault
     HEAVYWEIGHT_HANDLER 0x5400 general_exception
     HEAVYWEIGHT_HANDLER 0x5500 disabled_fp_register
     HEAVYWEIGHT_HANDLER 0x5600

 /branches/dd/kernel/arch/ia64/src/mm/tlb.c
 ,6 → 710,37
     page_table_unlock(AS, true);
 }
+/** Data access rights fault handler.
+ *
+ * @param vector Interruption vector.
+ * @param istate Structure with saved interruption state.
+ */
+void data_access_rights_fault(uint64_t vector, istate_t *istate)
+{
+    region_register rr;
+    rid_t rid;
+    uintptr_t va;
+    pte_t *t;
+    va = istate->cr_ifa;    /* faulting address */
+    rr.word = rr_read(VA2VRN(va));
+    rid = rr.map.rid;
+    /*
+     * Assume a write to a read-only page.
+     */
+    page_table_lock(AS, true);
+    t = page_mapping_find(AS, va);
+    ASSERT(t && t->p);
+    ASSERT(!t->w);
+    if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
+        fault_if_from_uspace(istate, "Page fault at %p.", va);
+        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+            istate->cr_iip);
+    }
+    page_table_unlock(AS, true);
+}
 /** Page not present fault handler.
  *
  * @param vector Interruption vector.

/branches/dd/kernel/arch/arm32/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/arm32/Makefile.inc
 ,7 → 39,8
 GCC_CFLAGS += -fno-zero-initialized-in-bss
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = LE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/start.S \

/branches/dd/kernel/arch/ppc32/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/ppc32/Makefile.inc
 ,7 → 39,8
 AFLAGS += -a32
 LFLAGS += -no-check-sections -N
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = BE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/context.S \

 /branches/dd/kernel/arch/ppc32/src/ppc32.c
 ,6 → 36,7
 #include <arch.h>
 #include <arch/boot/boot.h>
 #include <genarch/drivers/via-cuda/cuda.h>
+#include <genarch/kbrd/kbrd.h>
 #include <arch/interrupt.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
 ,31 → 118,6
         /* Initialize IRQ routing */
         irq_init(IRQ_COUNT, IRQ_COUNT);
-        if (bootinfo.macio.addr) {
-            /* Initialize PIC */
-            cir_t cir;
-            void *cir_arg;
-            pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg);
-#ifdef CONFIG_VIA_CUDA
-            uintptr_t pa = bootinfo.macio.addr + 0x16000;
-            uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
-            size_t offset = pa - aligned_addr;
-            size_t size = 2 * PAGE_SIZE;
-            cuda_t *cuda = (cuda_t *)
-                (hw_map(aligned_addr, offset + size) + offset);
-            /* Initialize I/O controller */
-            cuda_instance_t *cuda_instance =
-                cuda_init(cuda, IRQ_CUDA, cir, cir_arg);
-            if (cuda_instance) {
-                indev_t *sink = stdin_wire();
-                cuda_wire(cuda_instance, sink);
-            }
-#endif
-        }
         /* Merge all zones to 1 big zone */
         zone_merge_all();
     }
 ,6 → 133,35
 void arch_post_smp_init(void)
 {
+    if (bootinfo.macio.addr) {
+        /* Initialize PIC */
+        cir_t cir;
+        void *cir_arg;
+        pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg);
+#ifdef CONFIG_MAC_KBD
+        uintptr_t pa = bootinfo.macio.addr + 0x16000;
+        uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
+        size_t offset = pa - aligned_addr;
+        size_t size = 2 * PAGE_SIZE;
+        cuda_t *cuda = (cuda_t *)
+            (hw_map(aligned_addr, offset + size) + offset);
+        /* Initialize I/O controller */
+        cuda_instance_t *cuda_instance =
+            cuda_init(cuda, IRQ_CUDA, cir, cir_arg);
+        if (cuda_instance) {
+            kbrd_instance_t *kbrd_instance = kbrd_init();
+            if (kbrd_instance) {
+                indev_t *sink = stdin_wire();
+                indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
+                cuda_wire(cuda_instance, kbrd);
+                pic_enable_interrupt(IRQ_CUDA);
+            }
+        }
+#endif
+    }
 }
 void calibrate_delay_loop(void)

/branches/dd/kernel/arch/amd64/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/amd64/Makefile.inc
 ,7 → 41,8
 ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += -m64 -xmodel=kernel
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = LE
 ## Accepted CPUs
 #

/branches/dd/kernel/arch/mips32/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/mips32/include/context_offset.h
 ,7 → 86,7
 #define EOFFSET_STATUS 0x58
 #define EOFFSET_EPC    0x5c
 #define EOFFSET_K1     0x60
-#define REGISTER_SPACE 100
+#define REGISTER_SPACE 104  /* respect stack alignment */
 #ifdef __ASM__

 /branches/dd/kernel/arch/mips32/include/elf.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup mips32
+/** @addtogroup mips32
  * @{
  */
 /** @file
 ,17 → 35,15
 #ifndef KERN_mips32_ELF_H_
 #define KERN_mips32_ELF_H_
-#include <byteorder.h>
+#define ELF_MACHINE  EM_MIPS
-#define ELF_MACHINE     EM_MIPS
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define ELF_DATA_ENCODING ELFDATA2MSB
+#ifdef __BE__
+    #define ELF_DATA_ENCODING  ELFDATA2MSB
 #else
-#  define ELF_DATA_ENCODING ELFDATA2LSB
+    #define ELF_DATA_ENCODING  ELFDATA2LSB
 #endif
-#define ELF_CLASS       ELFCLASS32
+#define ELF_CLASS  ELFCLASS32
 #endif

 /branches/dd/kernel/arch/mips32/Makefile.inc
 ,7 → 36,7
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
-DEFS += -D__32_BITS__
+BITS = 32
 ## Accepted MACHINEs
 #
 ,15 → 43,18
 ifeq ($(MACHINE),lgxemul)
     BFD_NAME = elf32-tradlittlemips
+    ENDIANESS = LE
 endif
 ifeq ($(MACHINE),bgxemul)
     BFD_NAME = elf32-tradbigmips
     TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
     TARGET = mips-linux-gnu
-    GCC_CFLAGS += -DBIG_ENDIAN
+    ENDIANESS = BE
+    GCC_CFLAGS += -D__BE__
 endif
 ifeq ($(MACHINE),msim)
     BFD_NAME = elf32-tradlittlemips
+    ENDIANESS = LE
     GCC_CFLAGS += -mhard-float
 endif

/branches/dd/kernel/arch/ia32/include/byteorder.h
File deleted

 /branches/dd/kernel/arch/ia32/Makefile.inc
 ,7 → 35,8
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = LE
 CMN1 = -m32
 GCC_CFLAGS += $(CMN1)

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4667 → Rev 4668