Changeset 3dbe4ca2 in mainline for uspace/srv

Timestamp:

2011-04-29T11:10:24Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

ce8f4f4

Parents:

d260a95 (diff), 933cadf (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/srv

Files:

• devman/devman.c (modified) (3 diffs)
• devman/devman.h (modified) (2 diffs)
• devman/main.c (modified) (6 diffs)
• fs/fat/fat_fat.c (modified) (1 diff)
• fs/fat/fat_idx.c (modified) (1 diff)
• fs/fat/fat_ops.c (modified) (5 diffs)
• hw/netif/ne2000/dp8390.c (modified) (1 diff)
• loader/arch/ia64/_link.ld.in (modified) (1 diff)
• ns/clonable.c (modified) (1 diff)
• ns/service.c (modified) (1 diff)
• ns/task.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -39 +39 @@
 #include <devmap.h>
 #include <str_error.h>
+#include <stdio.h>
 
 #include "devman.h"
@@ -555 +556 @@
 }
 
-/** Remember the driver's phone.
- *
- * @param driver        The driver.
- * @param phone         The phone to the driver.
- */
-void set_driver_phone(driver_t *driver, sysarg_t phone)
-{
-        fibril_mutex_lock(&driver->driver_mutex);
-        assert(driver->state == DRIVER_STARTING);
-        driver->phone = phone;
-        fibril_mutex_unlock(&driver->driver_mutex);
-}
-
 /** Notify driver about the devices to which it was assigned.
  *
@@ -685 +673 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
+        drv->phone = -1;
 }
 

uspace/srv/devman/devman.h

@@ -88 +88 @@
         
         /** Phone asociated with this driver. */
-        sysarg_t phone;
+        int phone;
         /** Name of the device driver. */
         char *name;
@@ -316 +316 @@
 
 extern driver_t *find_driver(driver_list_t *, const char *);
-extern void set_driver_phone(driver_t *, sysarg_t);
 extern void initialize_running_driver(driver_t *, dev_tree_t *);
 

uspace/srv/devman/main.c

@@ -95 +95 @@
         /* Find driver structure. */
         driver = find_driver(&drivers_list, drv_name);
-        
         if (driver == NULL) {
                 log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name);
@@ -107 +106 @@
         drv_name = NULL;
         
+        fibril_mutex_lock(&driver->driver_mutex);
+        
+        if (driver->phone >= 0) {
+                /* We already have a connection to the driver. */
+                log_msg(LVL_ERROR, "Driver '%s' already started.\n",
+                    driver->name);
+                fibril_mutex_unlock(&driver->driver_mutex);
+                async_answer_0(iid, EEXISTS);
+                return NULL;
+        }
+        
+        switch (driver->state) {
+        case DRIVER_NOT_STARTED:
+                /* Somebody started the driver manually. */
+                log_msg(LVL_NOTE, "Driver '%s' started manually.\n",
+                    driver->name);
+                driver->state = DRIVER_STARTING;
+                break;
+        case DRIVER_STARTING:
+                /* The expected case */
+                break;
+        case DRIVER_RUNNING:
+                /* Should not happen since we do not have a connected phone */
+                assert(false);
+        }
+        
         /* Create connection to the driver. */
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
@@ -113 +138 @@
         ipc_callid_t callid = async_get_call(&call);
         if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+                fibril_mutex_unlock(&driver->driver_mutex);
                 async_answer_0(callid, ENOTSUP);
                 async_answer_0(iid, ENOTSUP);
@@ -119 +145 @@
         
         /* Remember driver's phone. */
-        set_driver_phone(driver, IPC_GET_ARG5(call));
+        driver->phone = IPC_GET_ARG5(call);
+        
+        fibril_mutex_unlock(&driver->driver_mutex);
         
         log_msg(LVL_NOTE, 
@@ -578 +606 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone <= 0) {
+        if (driver->phone < 0) {
                 log_msg(LVL_ERROR, 
                     "Could not forward to driver `%s' (phone is %d).",
@@ -618 +646 @@
         dev = fun->dev;
         
-        if (dev->state != DEVICE_USABLE || dev->drv->phone <= 0) {
+        if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) {
                 async_answer_0(iid, EINVAL);
                 return;

uspace/srv/fs/fat/fat_fat.c

@@ -47 +47 @@
 #include <assert.h>
 #include <fibril_synch.h>
+#include <malloc.h>
 #include <mem.h>
 

uspace/srv/fs/fat/fat_idx.c

@@ -44 +44 @@
 #include <assert.h>
 #include <fibril_synch.h>
+#include <malloc.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */

uspace/srv/fs/fat/fat_ops.c

@@ -55 +55 @@
 #include <sys/mman.h>
 #include <align.h>
+#include <malloc.h>
 
 #define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
@@ -724 +725 @@
                     (str_cmp((char *) d->name, FAT_NAME_DOT)) == 0) {
                         memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
+                        memcpy(d->name, FAT_NAME_DOT, FAT_NAME_LEN);
+                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
                         d->attr = FAT_ATTR_SUBDIR;
                         d->firstc = host2uint16_t_le(childp->firstc);
@@ -734 +735 @@
                     (str_cmp((char *) d->name, FAT_NAME_DOT_DOT) == 0)) {
                         memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
+                        memcpy(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN);
+                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
                         d->attr = FAT_ATTR_SUBDIR;
                         d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
@@ -1002 +1003 @@
         }
 
-        /* Determining type of FAT  */
-        if (FAT_IS_FAT12(bs)) {
-                printf("Found FAT12 filesystem\n");
-        } else if (FAT_IS_FAT16(bs)) {
-                printf("Found FAT16 filesystem\n");
-        } else {
-                printf("FAT32 filesystem is not supported by FAT server.\n");
+        /* Return NOT SUPPORTED if try to mount FAT32  */
+        if (!FAT_IS_FAT12(bs) && !FAT_IS_FAT16(bs)) {
                 block_fini(devmap_handle);
                 async_answer_0(rid, ENOTSUP);
@@ -1017 +1013 @@
         rc = fat_sanity_check(bs, devmap_handle);
         if (rc != EOK) {
-                printf("Sanity check failed\n");
                 (void) block_cache_fini(devmap_handle);
                 block_fini(devmap_handle);

uspace/srv/hw/netif/ne2000/dp8390.c

@@ -53 +53 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <stdio.h>
 #include <libarch/ddi.h>
 #include <net/packet.h>

uspace/srv/loader/arch/ia64/_link.ld.in

@@ -28 +28 @@
         
         .got : {
-                _gp = .;
+                /* Tell the linker where we expect GP to point. */
+                __gp = .;
                 *(.got .got.*);
         } :data

uspace/srv/ns/clonable.c

@@ -78 +78 @@
         if (list_empty(&cs_req)) {
                 /* There was no pending connection request. */
-                printf(NAME ": Unexpected clonable server.\n");
+                printf("%s: Unexpected clonable server.\n", NAME);
                 ipc_answer_0(callid, EBUSY);
                 return;

uspace/srv/ns/service.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <stdio.h>
+#include <malloc.h>
 #include "service.h"
 #include "ns.h"

uspace/srv/ns/task.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <macros.h>
+#include <malloc.h>
 #include "task.h"
 #include "ns.h"