Changeset c916dfc in mainline for uspace

Timestamp:

2011-08-20T13:44:26Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

81bc309

Parents:

5fb32c5 (diff), 4e6577c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace

Files:

• app/bdsh/tok.c (modified) (1 diff)
• app/bdsh/tok.h (modified) (2 diffs)
• lib/c/arch/ia32/include/ddi.h (modified) (1 diff)

uspace/app/bdsh/tok.c

@@ -224 +224 @@
 wchar_t tok_look_char(tokenizer_t *tok)
 {
-        unsigned int old_offset = tok->in_offset;
-        unsigned int old_char_offset = tok->in_char_offset;
+        size_t old_offset = tok->in_offset;
+        size_t old_char_offset = tok->in_char_offset;
         wchar_t ret = tok_get_char(tok);
         tok->in_offset = old_offset;

uspace/app/bdsh/tok.h

@@ -38 +38 @@
 typedef struct {
         char *text;
-        unsigned int byte_start;
-        unsigned int char_start;
+        size_t byte_start;
+        size_t char_start;
         size_t byte_length;
         size_t char_length;
@@ -47 +47 @@
 typedef struct {
         char *in;
-        unsigned int in_offset;
-        unsigned int last_in_offset;
-        unsigned int in_char_offset;
-        unsigned int last_in_char_offset;
+        size_t in_offset;
+        size_t last_in_offset;
+        size_t in_char_offset;
+        size_t last_in_char_offset;
         
         char *outbuf;

uspace/lib/c/arch/ia32/include/ddi.h

@@ -41 +41 @@
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        uint8_t val;
-        
-        asm volatile (
-                "inb %w1, %b0\n"
-                : "=a" (val)
-                : "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                uint8_t val;
+                asm volatile (
+                        "inb %w1, %b0\n"
+                        : "=a" (val)
+                        : "d" (port)
+                );
+                return val;
+        } else {
+                return (uint8_t) *port;
+        }
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        uint16_t val;
-        
-        asm volatile (
-                "inw %w1, %w0\n"
-                : "=a" (val)
-                : "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                uint16_t val;
+                asm volatile (
+                        "inw %w1, %w0\n"
+                        : "=a" (val)
+                        : "d" (port)
+                );
+                return val;
+        } else {
+                return (uint16_t) *port;
+        }
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        uint32_t val;
-        
-        asm volatile (
-                "inl %w1, %0\n"
-                : "=a" (val)
-                : "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                uint32_t val;
+                asm volatile (
+                        "inl %w1, %0\n"
+                        : "=a" (val)
+                        : "d" (port)
+                );
+                return val;
+        } else {
+                return (uint32_t) *port;
+        }
 }
 
 static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-        asm volatile (
-                "outb %b0, %w1\n"
-                :: "a" (val), "d" (port)
-        );
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outb %b0, %w1\n"
+                        :: "a" (val), "d" (port)
+                );      
+        } else {
+                *port = val;
+        }
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-        asm volatile (
-                "outw %w0, %w1\n"
-                :: "a" (val), "d" (port)
-        );
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outw %w0, %w1\n"
+                        :: "a" (val), "d" (port)
+                );
+        } else {
+                *port = val;
+        }
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-        asm volatile (
-                "outl %0, %w1\n"
-                :: "a" (val), "d" (port)
-        );
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outl %0, %w1\n"
+                        :: "a" (val), "d" (port)
+                );
+        } else {
+                *port = val;
+        }
 }