42,10 → 42,11 |
#include <ipc/bd.h> |
#include <async.h> |
#include <as.h> |
#include <futex.h> |
#include <fibril_sync.h> |
#include <devmap.h> |
#include <sys/types.h> |
#include <errno.h> |
#include <task.h> |
|
#define NAME "gxe_bd" |
|
91,11 → 92,11 |
|
static dev_handle_t dev_handle[MAX_DISKS]; |
|
static atomic_t dev_futex = FUTEX_INITIALIZER; |
static fibril_mutex_t dev_lock[MAX_DISKS]; |
|
static int gxe_bd_init(void); |
static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall); |
static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size, |
static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, size_t size, |
void *buf); |
static int gxe_bd_read_block(int disk_id, uint64_t offset, size_t size, |
void *buf); |
110,6 → 111,7 |
return -1; |
|
printf(NAME ": Accepting connections\n"); |
task_retval(0); |
async_manager(); |
|
/* Not reached */ |
145,6 → 147,7 |
name); |
return rc; |
} |
fibril_mutex_initialize(&dev_lock[i]); |
} |
|
return EOK; |
160,7 → 163,7 |
int flags; |
int retval; |
off_t idx; |
off_t size; |
size_t size; |
int disk_id, i; |
|
/* Get the device handle. */ |
220,7 → 223,7 |
} |
} |
|
static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size, |
static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, size_t size, |
void *buf) |
{ |
int rc; |
256,7 → 259,7 |
size_t i; |
uint32_t w; |
|
futex_down(&dev_futex); |
fibril_mutex_lock(&dev_lock[disk_id]); |
pio_write_32(&dev->offset_lo, (uint32_t) offset); |
pio_write_32(&dev->offset_hi, offset >> 32); |
pio_write_32(&dev->disk_id, disk_id); |
264,6 → 267,7 |
|
status = pio_read_32(&dev->status); |
if (status == STATUS_FAILURE) { |
fibril_mutex_unlock(&dev_lock[disk_id]); |
return EIO; |
} |
|
271,7 → 275,7 |
((uint8_t *) buf)[i] = w = pio_read_8(&dev->buffer[i]); |
} |
|
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock[disk_id]); |
return EOK; |
} |
|
285,7 → 289,7 |
pio_write_8(&dev->buffer[i], ((const uint8_t *) buf)[i]); |
} |
|
futex_down(&dev_futex); |
fibril_mutex_lock(&dev_lock[disk_id]); |
pio_write_32(&dev->offset_lo, (uint32_t) offset); |
pio_write_32(&dev->offset_hi, offset >> 32); |
pio_write_32(&dev->disk_id, disk_id); |
293,10 → 297,11 |
|
status = pio_read_32(&dev->status); |
if (status == STATUS_FAILURE) { |
fibril_mutex_unlock(&dev_lock[disk_id]); |
return EIO; |
} |
|
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock[disk_id]); |
return EOK; |
} |
|