Changeset c5ebb59 in mainline

Timestamp:

2011-12-08T20:17:19Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

40898df

Parents:

1adbf90 (diff), b5daa89 (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:

fix ticket #399 on ia32
(the amd64 case is probably unrelated)

Location:

uspace

Files:

• lib/c/generic/ddi.c (modified) (1 diff)
• lib/c/include/ddi.h (modified) (1 diff)
• srv/bd/rd/rd.c (modified) (2 diffs)

uspace/lib/c/generic/ddi.c

@@ -53 +53 @@
 }
 
-/** Map piece of physical memory to task.
+/** Map a piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf            Physical address of the starting frame.
- * @param vp            Virtual address of the starting page.
- * @param pages         Number of pages to map.
- * @param flags         Flags for the new address space area.
+ * @param pf    Physical address of the starting frame.
+ * @param vp    Virtual address of the starting page.
+ * @param pages Number of pages to map.
+ * @param flags Flags for the new address space area.
  *
- * @return              0 on success, EPERM if the caller lacks the
- *                      CAP_MEM_MANAGER capability, ENOENT if there is no task
- *                      with specified ID and ENOMEM if there was some problem
- *                      in creating address space area.
+ * @return EOK on success
+ * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability
+ * @return ENOENT if there is no task with specified ID
+ * @return ENOMEM if there was some problem in creating
+ *         the address space area.
+ *
  */
-int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
+int physmem_map(void *pf, void *vp, size_t pages, unsigned int flags)
 {
-        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
-            flags);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp,
+            pages, flags);
 }
 

uspace/lib/c/include/ddi.h

@@ -41 +41 @@
 
 extern int device_assign_devno(void);
-extern int physmem_map(void *, void *, unsigned long, int);
+extern int physmem_map(void *, void *, size_t, unsigned int);
 extern int iospace_enable(task_id_t, void *, unsigned long);
 extern int pio_enable(void *, size_t, void **);

uspace/srv/bd/rd/rd.c

@@ -55 +55 @@
 #include <ipc/bd.h>
 #include <macros.h>
-
-#define NAME "rd"
+#include <inttypes.h>
+
+#define NAME  "rd"
 
 /** Pointer to the ramdisk's image */
@@ -208 +209 @@
 static bool rd_init(void)
 {
-        int ret = sysinfo_get_value("rd.size", &rd_size);
-        if ((ret != EOK) || (rd_size == 0)) {
+        sysarg_t size;
+        int ret = sysinfo_get_value("rd.size", &size);
+        if ((ret != EOK) || (size == 0)) {
                 printf("%s: No RAM disk found\n", NAME);
                 return false;
         }
         
-        sysarg_t rd_ph_addr;
-        ret = sysinfo_get_value("rd.address.physical", &rd_ph_addr);
-        if ((ret != EOK) || (rd_ph_addr == 0)) {
+        sysarg_t addr_phys;
+        ret = sysinfo_get_value("rd.address.physical", &addr_phys);
+        if ((ret != EOK) || (addr_phys == 0)) {
                 printf("%s: Invalid RAM disk physical address\n", NAME);
                 return false;
         }
         
+        rd_size = ALIGN_UP(size, block_size);
         rd_addr = as_get_mappable_page(rd_size);
         
-        int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
-        int retval = physmem_map((void *) rd_ph_addr, rd_addr,
+        unsigned int flags =
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
+        ret = physmem_map((void *) addr_phys, rd_addr,
             ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
-        
-        if (retval < 0) {
+        if (ret < 0) {
                 printf("%s: Error mapping RAM disk\n", NAME);
                 return false;
         }
         
-        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
-            (void *) rd_ph_addr, rd_size);
-        
-        int rc = loc_server_register(NAME, rd_connection);
-        if (rc < 0) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
+        printf("%s: Found RAM disk at %p, %" PRIun " bytes\n", NAME,
+            (void *) addr_phys, size);
+        
+        ret = loc_server_register(NAME, rd_connection);
+        if (ret < 0) {
+                printf("%s: Unable to register driver (%d)\n", NAME, ret);
                 return false;
         }
         
         service_id_t service_id;
-        if (loc_service_register("bd/initrd", &service_id) != EOK) {
+        ret = loc_service_register("bd/initrd", &service_id);
+        if (ret != EOK) {
                 printf("%s: Unable to register device service\n", NAME);
                 return false;