i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

512 as block size. Typo.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20993 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-05-03 06:37:38 +00:00
parent 3ca76df52e
commit a0062874c5
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
+7 -5
View File
@@ -43,6 +43,7 @@
#define DEVICE_FMT DEVICE_PREFIX "%d/raw" #define DEVICE_FMT DEVICE_PREFIX "%d/raw"
#define DEVICE_NAME_MAX 32 #define DEVICE_NAME_MAX 32
#define MAX_REQ_SIZE (32*1024*1024) #define MAX_REQ_SIZE (32*1024*1024)
#define BLKSIZE 512
/* debugging */ /* debugging */
#if DEBUG #if DEBUG
@@ -450,7 +451,7 @@ status_t nbd_free(cookie_t *cookie) {
} }
status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) { status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
PRINT((DP ">%s(%d, %ul, , %d)\n", __FUNCTION__, WHICH(cookie->dev), op, len)); PRINT((DP ">%s(%d, %lu, , %d)\n", __FUNCTION__, WHICH(cookie->dev), op, len));
switch (op) { switch (op) {
case B_GET_DEVICE_SIZE: /* this one is broken anyway... */ case B_GET_DEVICE_SIZE: /* this one is broken anyway... */
if (data) { if (data) {
@@ -475,9 +476,9 @@ status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
case B_GET_BIOS_GEOMETRY: case B_GET_BIOS_GEOMETRY:
if (data) { if (data) {
device_geometry *geom = (device_geometry *)data; device_geometry *geom = (device_geometry *)data;
geom->bytes_per_sector = 256; geom->bytes_per_sector = BLKSIZE;
geom->sectors_per_track = 1; geom->sectors_per_track = 1;
geom->cylinder_count = cookie->dev->size / 256; geom->cylinder_count = cookie->dev->size / BLKSIZE;
geom->head_count = 1; geom->head_count = 1;
geom->device_type = B_DISK; geom->device_type = B_DISK;
geom->removable = false; geom->removable = false;
@@ -495,10 +496,11 @@ status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
case B_EJECT_DEVICE: case B_EJECT_DEVICE:
case B_LOAD_MEDIA: case B_LOAD_MEDIA:
return ENOSYS; return B_BAD_VALUE;
case B_FLUSH_DRIVE_CACHE: /* wait for request list to be empty ? */ case B_FLUSH_DRIVE_CACHE: /* wait for request list to be empty ? */
return B_OK;
default: default:
return ENOSYS; return B_BAD_VALUE;
} }
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
} }