Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2247 → Rev 2248

/branches/fs/uspace/rd/rd.c
45,8 → 45,20
#include <bool.h>
#include <errno.h>
#include <async.h>
#include <stdlib.h>
#include <unistd.h>
#include <align.h>
#include <async.h>
#include <ddi.h>
#include <sysinfo.h>
#include <libarch/ddi.h>
 
#include "rd.h"
 
#define EOK 0
 
static void * rd_addr;
 
static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
{
ipc_callid_t callid;
54,6 → 66,8
int retval;
 
ipc_answer_fast(iid, 0, 0, 0);
int block_size = 512;
ipcarg_t dst, offset;
 
while (1) {
callid = async_get_call(&call);
61,6 → 75,14
case IPC_M_PHONE_HUNGUP:
ipc_answer_fast(callid, 0,0,0);
return;
case BD_READ_BLOCK:
//returnt the block data
dst = IPC_GET_ARG1(call);
offset = IPC_GET_ARG2(call);
//copy_from_uspace(dst, rd_addr+offset,block_size);
memcpy((void *) dst, rd_addr+offset, block_size);
retval = EOK;
break;
default:
retval = EINVAL;
}
78,7 → 100,7
if (rd_size == 0)
return false;
void * rd_addr = as_get_mappable_page(rd_size, rd_color);
rd_addr = as_get_mappable_page(rd_size, rd_color);
physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
/branches/fs/uspace/fs/fs.c
35,10 → 35,83
* @brief File system driver for HelenOS.
*/
 
#include <ipc/ipc.h>
#include <ipc/services.h>
#include <ipc/ns.h>
#include <sysinfo.h>
#include <stdio.h>
#include <stdlib.h>
#include <as.h>
#include <ddi.h>
#include <align.h>
#include <bool.h>
#include <errno.h>
#include <async.h>
#include "fs.h"
 
 
static void fs_connection(ipc_callid_t iid, ipc_call_t *icall)
{
ipc_callid_t callid;
ipc_call_t call;
int retval;
 
ipc_answer_fast(iid, 0, 0, 0);
 
while (1) {
callid = async_get_call(&call);
switch (IPC_GET_METHOD(call)) {
case IPC_M_PHONE_HUNGUP:
ipc_answer_fast(callid, 0,0,0);
return;
case FS_OPEN:
//Why doesn't printf do anything in this task?
printf("FS_OPEN called");
char * f_name = (char *) IPC_GET_ARG1(call);
printf("I should open file: %s \n",f_name);
retval = 73;
break;
case FS_READ:
printf("FS_READ called");
unsigned int file_handle = IPC_GET_ARG1(call);
void * buffer = (void *) IPC_GET_ARG2(call);
unsigned int count = IPC_GET_ARG3(call);
//I still don't know how to copy memory to another task :(
//Or can i only map memory?
retval = 0;
break;
default:
retval = EINVAL;
}
ipc_answer_fast(callid, retval, 0, 0);
}
}
 
 
static bool fs_init(void)
{
return true;
}
 
int main(int argc, char **argv)
{
return 0;
if (fs_init()) {
ipcarg_t phonead;
async_set_client_connection(fs_connection);
/* Register service at nameserver */
if (ipc_connect_to_me(PHONE_NS, SERVICE_FS, 0, &phonead) != 0)
return -1;
async_manager();
/* Never reached */
return 0;
}
return -1;
}
 
/**
/branches/fs/uspace/libc/include/ipc/services.h
42,6 → 42,7
#define SERVICE_VIDEO 3
#define SERVICE_CONSOLE 4
#define SERVICE_RD 5
#define SERVICE_FS 6
 
/* Memory area to be received from NS */
#define SERVICE_MEM_REALTIME 1