Changeset c5747fe in mainline

Timestamp:

2009-05-18T17:16:24Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

1090b8c

Parents:

687246b

Message:

Rename ramdisk protocol → block device protocol.

Location:

uspace

Files:

• lib/libblock/libblock.c (modified) (2 diffs)
• lib/libc/include/ipc/bd.h (moved) (moved from uspace/srv/rd/rd.h ) (2 diffs)
• srv/rd/rd.c (modified) (3 diffs)

uspace/lib/libblock/libblock.c

@@ -38 +38 @@
 #include "libblock.h"
 #include "../../srv/vfs/vfs.h"
-#include "../../srv/rd/rd.h"
 #include <ipc/devmap.h>
+#include <ipc/bd.h>
 #include <ipc/services.h>
 #include <errno.h>
@@ -478 +478 @@
                         /* Refill the communication buffer with a new block. */
                         ipcarg_t retval;
-                        int rc = async_req_2_1(devcon->dev_phone, RD_READ_BLOCK,
+                        int rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK,
                             *pos / block_size, block_size, &retval);
                         if ((rc != EOK) || (retval != EOK))

uspace/lib/libc/include/ipc/bd.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Michal Konopa
- * Copyright (c) 2007 Martin Jelen
- * Copyright (c) 2007 Peter Majer
- * Copyright (c) 2007 Jakub Jermar
+ * Copyright (c) 2009 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +27 @@
  */
 
-/** @addtogroup rd
+/** @addtogroup libcipc
  * @{
  */
+/** @file
+ */ 
 
-/**
- * @file        rd.h
- * @brief       Initial RAM disk for HelenOS - header
- */
+#ifndef LIBC_IPC_BD_H_
+#define LIBC_IPC_BD_H_
 
-/* Basic constants. */
+#include <ipc/ipc.h>
 
-#ifndef RD_RD_H_
-#define RD_RD_H_
-
-#define RD_BASE         1024
-#define RD_READ_BLOCK   (RD_BASE + 1)   /**< Method for reading block. */
-#define RD_WRITE_BLOCK  (RD_BASE + 2)   /**< Method for writing block. */
+typedef enum {
+        BD_READ_BLOCK = IPC_FIRST_USER_METHOD,
+        BD_WRITE_BLOCK
+} bd_request_t;
 
 #endif
+
+/** @}
+ */

uspace/srv/rd/rd.c

@@ -54 +54 @@
 #include <stdio.h>
 #include <ipc/devmap.h>
-#include "rd.h"
+#include <ipc/bd.h>
 
 #define NAME "rd"
@@ -123 +123 @@
                         ipc_answer_0(callid, EOK);
                         return;
-                case RD_READ_BLOCK:
+                case BD_READ_BLOCK:
                         offset = IPC_GET_ARG1(call);
                         block_size = IPC_GET_ARG2(call);
@@ -145 +145 @@
                         retval = EOK;
                         break;
-                case RD_WRITE_BLOCK:
+                case BD_WRITE_BLOCK:
                         offset = IPC_GET_ARG1(call);
                         block_size = IPC_GET_ARG2(call);