/trunk/uspace/srv/bd/file_bd/file_bd.c |
---|
44,7 → 44,7 |
#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> |
56,7 → 56,7 |
static FILE *img; |
static dev_handle_t dev_handle; |
static atomic_t dev_futex = FUTEX_INITIALIZER; |
static fibril_mutex_t dev_lock; |
static int file_bd_init(const char *fname); |
static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall); |
106,6 → 106,8 |
if (img == NULL) |
return EINVAL; |
fibril_mutex_initialize(&dev_lock); |
return EOK; |
} |
169,23 → 171,17 |
{ |
size_t n_rd; |
printf("file_bd_read\n"); |
futex_down(&dev_futex); |
fibril_mutex_lock(&dev_lock); |
printf("seek\n"); |
fseek(img, blk_idx * size, SEEK_SET); |
printf("read\n"); |
n_rd = fread(buf, 1, size, img); |
printf("done\n"); |
printf("done\n"); |
if (ferror(img)) { |
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock); |
return EIO; /* Read error */ |
} |
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock); |
if (n_rd < size) |
return EINVAL; /* Read beyond end of disk */ |
197,17 → 193,17 |
{ |
size_t n_wr; |
futex_down(&dev_futex); |
fibril_mutex_lock(&dev_lock); |
fseek(img, blk_idx * size, SEEK_SET); |
n_wr = fread(buf, 1, size, img); |
if (ferror(img) || n_wr < size) { |
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock); |
return EIO; /* Write error */ |
} |
futex_up(&dev_futex); |
fibril_mutex_unlock(&dev_lock); |
return EOK; |
} |
/trunk/uspace/srv/bd/gxe_bd/gxe_bd.c |
---|
42,7 → 42,7 |
#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> |
91,7 → 91,7 |
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); |
145,6 → 145,7 |
name); |
return rc; |
} |
fibril_mutex_initialize(&dev_lock[i]); |
} |
return EOK; |
256,7 → 257,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 → 265,7 |
status = pio_read_32(&dev->status); |
if (status == STATUS_FAILURE) { |
fibril_mutex_unlock(&dev_lock[disk_id]); |
return EIO; |
} |
271,7 → 273,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 → 287,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 → 295,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; |
} |
/trunk/uspace/srv/bd/ata_bd/ata_bd.h |
---|
36,6 → 36,7 |
#define __ATA_BD_H__ |
#include <sys/types.h> |
#include <fibril_sync.h> |
enum { |
CTL_READ_START = 0, |
139,6 → 140,9 |
unsigned cylinders; |
unsigned sectors; |
uint64_t blocks; |
fibril_mutex_t lock; |
dev_handle_t dev_handle; |
} disk_t; |
#endif |
/trunk/uspace/srv/bd/ata_bd/ata_bd.c |
---|
37,6 → 37,9 |
* This driver currently works only with CHS addressing and uses PIO. |
* Currently based on the (now obsolete) ANSI X3.221-1994 (ATA-1) standard. |
* At this point only reading is possible, not writing. |
* |
* The driver services a single controller which can have up to two disks |
* attached. |
*/ |
#include <stdio.h> |
46,7 → 49,7 |
#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> |
64,10 → 67,7 |
static ata_cmd_t *cmd; |
static ata_ctl_t *ctl; |
static dev_handle_t dev_handle[MAX_DISKS]; |
static atomic_t dev_futex = FUTEX_INITIALIZER; |
/** Per-disk state. */ |
static disk_t disk[MAX_DISKS]; |
static int ata_bd_init(void); |
89,8 → 89,7 |
printf(NAME ": ATA disk driver\n"); |
printf("cmd_physical = 0x%x\n", cmd_physical); |
printf("ctl_physical = 0x%x\n", ctl_physical); |
printf("I/O address 0x%x\n", cmd_physical); |
if (ata_bd_init() != EOK) |
return -1; |
120,7 → 119,7 |
continue; |
snprintf(name, 16, "disk%d", i); |
rc = devmap_device_register(name, &dev_handle[i]); |
rc = devmap_device_register(name, &disk[i].dev_handle); |
if (rc != EOK) { |
devmap_hangup_phone(DEVMAP_DRIVER); |
printf(NAME ": Unable to register device %s.\n", |
181,8 → 180,6 |
} |
} |
printf("\n\nStatus = 0x%x\n", pio_read_8(&cmd->status)); |
d->blocks = d->cylinders * d->heads * d->sectors; |
printf("Geometry: %u cylinders, %u heads, %u sectors\n", |
189,6 → 186,7 |
d->cylinders, d->heads, d->sectors); |
d->present = true; |
fibril_mutex_initialize(&d->lock); |
return EOK; |
} |
243,7 → 241,7 |
/* Determine which disk device is the client connecting to. */ |
disk_id = -1; |
for (i = 0; i < MAX_DISKS; i++) |
if (dev_handle[i] == dh) |
if (disk[i].dev_handle == dh) |
disk_id = i; |
if (disk_id < 0 || disk[disk_id].present == false) { |
355,7 → 353,7 |
((disk_id != 0) ? DHR_DRV : 0) | |
(h & 0x0f); |
futex_down(&dev_futex); |
fibril_mutex_lock(&d->lock); |
/* Program a Read Sectors operation. */ |
377,7 → 375,7 |
((uint16_t *) buf)[i] = data; |
} |
futex_up(&dev_futex); |
fibril_mutex_unlock(&d->lock); |
return EOK; |
} |
409,7 → 407,7 |
((disk_id != 0) ? DHR_DRV : 0) | |
(h & 0x0f); |
futex_down(&dev_futex); |
fibril_mutex_lock(&d->lock); |
/* Program a Read Sectors operation. */ |
430,7 → 428,7 |
pio_write_16(&cmd->data_port, ((uint16_t *) buf)[i]); |
} |
futex_up(&dev_futex); |
fibril_mutex_unlock(&d->lock); |
return EOK; |
} |