diff options
| author | daiyoung kim <daiyoung777.kim@samsung.com> | 2013-11-12 03:19:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2013-11-12 03:19:14 -0800 |
| commit | 04fba6b616b2bff1e1eeee9cd27e351d34f7998b (patch) | |
| tree | 726f68b4f0d52cd22012c51e82c3d9fda71cc45a | |
| parent | 10823f274e0434b7719594eb0fa9453cdbece58f (diff) | |
| parent | 1cbb0a4a51938d10230a5f669dc0a28c8e38f650 (diff) | |
| download | emulator-kernel-04fba6b616b2bff1e1eeee9cd27e351d34f7998b.tar.gz emulator-kernel-04fba6b616b2bff1e1eeee9cd27e351d34f7998b.tar.bz2 emulator-kernel-04fba6b616b2bff1e1eeee9cd27e351d34f7998b.zip | |
Merge "brillcodec: Remove unused command." into tizen
| -rw-r--r-- | drivers/maru/maru_brillcodec.c | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/drivers/maru/maru_brillcodec.c b/drivers/maru/maru_brillcodec.c index 00d8b550585a..d01806a32cc9 100644 --- a/drivers/maru/maru_brillcodec.c +++ b/drivers/maru/maru_brillcodec.c @@ -105,8 +105,7 @@ enum codec_io_cmd { CODEC_CMD_GET_ELEMENT, CODEC_CMD_GET_CONTEXT_INDEX, CODEC_CMD_GET_ELEMENT_DATA, - CODEC_CMD_USE_DEVICE_MEM = 40, // plugin and driver - CODEC_CMD_GET_DATA_INTO_DEVICE_MEM, + CODEC_CMD_PUT_DATA_INTO_BUFFER = 40, // plugin and driver CODEC_CMD_SECURE_BUFFER, CODEC_CMD_TRY_SECURE_BUFFER, CODEC_CMD_RELEASE_BUFFER, @@ -186,9 +185,9 @@ struct maru_brill_codec_device { #define DEVICE_MEMORY_COUNT 8 #define CODEC_CONTEXT_SIZE 1024 -#define CODEC_S_DEVICE_MEM_COUNT 15 // small (256K) 8M -#define CODEC_M_DEVICE_MEM_COUNT 8 // medium (2M) 8M -#define CODEC_L_DEVICE_MEM_COUNT 3 // large (4M) 8M +#define CODEC_S_DEVICE_MEM_COUNT 15 // small (256K) 4M +#define CODEC_M_DEVICE_MEM_COUNT 8 // medium (2M) 16M +#define CODEC_L_DEVICE_MEM_COUNT 3 // large (4M) 12M #define CODEC_S_DEVICE_MEM_SIZE 0x40000 // small #define CODEC_M_DEVICE_MEM_SIZE 0x200000 // medium @@ -469,33 +468,7 @@ static long maru_brill_codec_ioctl(struct file *file, ret = -EIO; } break; - case CODEC_CMD_USE_DEVICE_MEM: - { - uint32_t mem_offset; - - if (copy_from_user(&mem_offset, (void *)arg, sizeof(uint32_t))) { - ERROR("ioctl: failed to copy data from user\n"); - ret = -EIO; - break; - } - - if (mem_offset >= maru_brill_codec->mem_size) { - DEBUG("offset of device memory is overflow!! 0x%x\n", mem_offset); - ret = -EIO; - } else { - // notify that codec device can copy data to memory region. - DEBUG("send a request to pop data from device. %p\n", file); - - ENTER_CRITICAL_SECTION; - writel((uint32_t)mem_offset, - maru_brill_codec->ioaddr + CODEC_CMD_DEVICE_MEM_OFFSET); - writel((uint32_t)file, - maru_brill_codec->ioaddr + CODEC_CMD_GET_DATA_FROM_QUEUE); - LEAVE_CRITICAL_SECTION; - } - } - break; - case CODEC_CMD_GET_DATA_INTO_DEVICE_MEM: + case CODEC_CMD_PUT_DATA_INTO_BUFFER: { uint32_t buf_size, offset; DEBUG("read data into small buffer\n"); |