Changeset ae49252 in mainline for uspace

Timestamp:

2012-07-18T21:45:07Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f4cf872

Parents:

349e510d (diff), 7030bc9 (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:

• Makefile (modified) (2 diffs)
• app/bdsh/cmds/modules/cat/cat.c (modified) (8 diffs)
• drv/block/ahci/Makefile (added)
• drv/block/ahci/ahci.c (added)
• drv/block/ahci/ahci.h (added)
• drv/block/ahci/ahci.ma (added)
• drv/block/ahci/ahci_hw.h (added)
• drv/block/ahci/ahci_sata.h (added)
• drv/bus/isa/isa.c (modified) (2 diffs)
• drv/nic/ne2k/dp8390.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/device/ahci.c (added)
• lib/c/include/device/ahci.h (added)
• lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• lib/drv/Makefile (modified) (1 diff)
• lib/drv/generic/dev_iface.c (modified) (2 diffs)
• lib/drv/generic/remote_ahci.c (added)
• lib/drv/include/ahci_iface.h (added)
• lib/drv/include/remote_ahci.h (added)
• srv/bd/sata_bd/Makefile (added)
• srv/bd/sata_bd/sata_bd.c (added)
• srv/bd/sata_bd/sata_bd.h (added)
• srv/devman/main.c (modified) (1 diff)
• srv/hid/console/console.c (modified) (3 diffs)

uspace/Makefile

@@ -86 +86 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -106 +107 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -62 +62 @@
 static sysarg_t console_rows = 0;
 static bool should_quit = false;
+static bool dash_represents_stdin = false;
 
 static console_ctrl_t *console = NULL;
@@ -73 +74 @@
         { "more", no_argument, 0, 'm' },
         { "hex", no_argument, 0, 'x' },
+        { "stdin", no_argument, 0, 's' },
         { 0, 0, 0, 0 }
 };
@@ -93 +95 @@
                 "  -m, --more       Pause after each screen full\n"
                 "  -x, --hex        Print bytes as hex values\n"
+                "  -s  --stdin      Treat `-' in file list as standard input\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -172 +175 @@
         off64_t file_size = 0, length = 0;
 
-        fd = open(fname, O_RDONLY);
+        bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
+        
+        if (reading_stdin) {
+                fd = fileno(stdin);
+                /* Allow storing the whole UTF-8 character. */
+                blen = STR_BOUNDS(1);
+        } else
+                fd = open(fname, O_RDONLY);
+        
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -207 +218 @@
 
         do {
-                bytes = read(fd, buff + copied_bytes, (
-                        (length != CAT_FULL_FILE && length - (off64_t)count <= (off64_t)(blen - copied_bytes)) ?
-                        (size_t)(length - count) :
-                        (blen - copied_bytes) ) );
+                size_t bytes_to_read;
+                if (reading_stdin) {
+                        bytes_to_read = 1;
+                } else {
+                        if ((length != CAT_FULL_FILE) &&
+                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                                bytes_to_read = (size_t) (length - count);
+                        } else {
+                                bytes_to_read = blen - copied_bytes;
+                        }
+                }
+                
+                bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
                 copied_bytes = 0;
@@ -242 +262 @@
                         reads++;
                 }
+                
+                if (reading_stdin)
+                        fflush(stdout);
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
@@ -284 +307 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -318 +341 @@
                         hex = true;
                         break;
+                case 's':
+                        dash_represents_stdin = true;
+                        break;
                 }
         }

uspace/drv/bus/isa/isa.c

@@ -201 +201 @@
 
         isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
-        if (fun == NULL)
+        if (fun == NULL) {
+                ddf_fun_destroy(fnode);
                 return NULL;
+        }
 
         fibril_mutex_initialize(&fun->mutex);
@@ -552 +554 @@
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
-                free(fun_name);
                 return NULL;
         }

uspace/drv/nic/ne2k/dp8390.c

@@ -201 +201 @@
         /* Check if the DP8390 is really there */
         uint8_t val = pio_read_8(ne2k->port + DP_CR);
-        if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
+        if ((val & (CR_STP | CR_TXP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
                 return EXDEV;
         

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/nic.c \
         generic/device/pci.c \
+        generic/device/ahci.c \
         generic/elf/elf_load.c \
         generic/event.c \

uspace/lib/c/include/ipc/dev_iface.h

@@ -51 +51 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+        /** Interface provided by AHCI devices. */
+        AHCI_DEV_IFACE,
 
         DEV_IFACE_MAX

uspace/lib/drv/Makefile

@@ -44 +44 @@
         generic/remote_pci.c \
         generic/remote_usbhc.c \
-        generic/remote_usbhid.c
+        generic/remote_usbhid.c \
+        generic/remote_ahci.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/drv/generic/dev_iface.c

@@ -46 +46 @@
 #include "remote_usbhid.h"
 #include "remote_pci.h"
+#include "remote_ahci.h"
 
 static iface_dipatch_table_t remote_ifaces = {
@@ -55 +56 @@
                 &remote_usb_iface,
                 &remote_usbhc_iface,
-                &remote_usbhid_iface
+                &remote_usbhid_iface,
+                &remote_ahci_iface
         }
 };

uspace/srv/devman/main.c

@@ -419 +419 @@
         
         /* Check that function with same name is not there already. */
-        if (find_fun_node_in_device(tree, pdev, fun_name) != NULL) {
+        fun_node_t *tfun = find_fun_node_in_device(tree, pdev, fun_name);
+        if (tfun) {
+                fun_del_ref(tfun);      /* drop the new unwanted reference */
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 dev_del_ref(pdev);

uspace/srv/hid/console/console.c

@@ -76 +76 @@
 } console_state_t;
 
+#define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1)
+
 typedef struct {
         atomic_t refcnt;           /**< Connection reference count */
         prodcons_t input_pc;       /**< Incoming keyboard events */
+        char char_remains[UTF8_CHAR_BUFFER_SIZE]; /**< Not yet sent bytes of last char event. */
+        size_t char_remains_len;   /**< Number of not yet sent bytes. */
         
         fibril_mutex_t mtx;        /**< Lock protecting mutable fields */
@@ -613 +617 @@
         
         size_t pos = 0;
+        
+        /*
+         * Read input from keyboard and copy it to the buffer.
+         * We need to handle situation when wchar is split by 2 following
+         * reads.
+         */
         while (pos < size) {
-                link_t *link = prodcons_consume(&cons->input_pc);
-                kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
-                
-                if (event->type == KEY_PRESS) {
-                        buf[pos] = event->c;
+                /* Copy to the buffer remaining characters. */
+                while ((pos < size) && (cons->char_remains_len > 0)) {
+                        buf[pos] = cons->char_remains[0];
                         pos++;
-                }
-                
-                free(event);
+                        
+                        /* Unshift the array. */
+                        for (size_t i = 1; i < cons->char_remains_len; i++)
+                                cons->char_remains[i - 1] = cons->char_remains[i];
+                        
+                        cons->char_remains_len--;
+                }
+                
+                /* Still not enough? Then get another key from the queue. */
+                if (pos < size) {
+                        link_t *link = prodcons_consume(&cons->input_pc);
+                        kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
+                        
+                        /* Accept key presses of printable chars only. */
+                        if ((event->type == KEY_PRESS) && (event->c != 0)) {
+                                wchar_t tmp[2] = { event->c, 0 };
+                                wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp);
+                                cons->char_remains_len = str_size(cons->char_remains);
+                        }
+                        
+                        free(event);
+                }
         }
         
@@ -930 +957 @@
                 fibril_mutex_initialize(&consoles[i].mtx);
                 prodcons_initialize(&consoles[i].input_pc);
+                consoles[i].char_remains_len = 0;
                 
                 if (graphics_state == GRAPHICS_FULL) {