From 7e3d3e9bf73fdb6d656e957f2c36fbe159eb52ee Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Mon, 15 Apr 2013 22:58:58 +0900 Subject: [PATCH] sdcard: Prepare virtio sdcard For higher performance and mount support by Tizen system framework. Change-Id: I05878ec01983c7dda65975f3135ebcf05442d788 Signed-off-by: SeokYeon Hwang --- drivers/block/virtio_blk.c | 9 +++++++++ drivers/virtio/virtio.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 0d39f2f4294a..257cd2884dbe 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -471,7 +471,16 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) q->queuedata = vblk; +#ifdef CONFIG_MARU // for virtio sdcard... + if (index == 2) { + snprintf(vblk->disk->disk_name, DISK_NAME_LEN, "mmcblk0"); + } + else { + virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN); + } +#else virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN); +#endif vblk->disk->major = major; vblk->disk->first_minor = index_to_minor(index); diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 984c501c258f..ba9979af7158 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -47,12 +47,30 @@ static ssize_t features_show(struct device *_d, len += sprintf(buf+len, "\n"); return len; } + +#ifdef CONFIG_MARU // for virtio sdcard... +#include "linux/virtio_ids.h" +static ssize_t type_show(struct device *_d, + struct device_attribute *attr, char *buf) +{ + struct virtio_device *dev = container_of(_d, struct virtio_device, dev); + + if (dev->id.device == VIRTIO_ID_BLOCK) { + //FIXME + return sprintf(buf, "SD\n"); + } + return sprintf(buf, "0\n"); +} +#endif static struct device_attribute virtio_dev_attrs[] = { __ATTR_RO(device), __ATTR_RO(vendor), __ATTR_RO(status), __ATTR_RO(modalias), __ATTR_RO(features), +#ifdef CONFIG_MARU + __ATTR_RO(type), +#endif __ATTR_NULL }; -- 2.34.1