diff options
| author | Ben Cheng <bccheng@google.com> | 2013-02-20 23:53:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-20 23:53:05 +0000 |
| commit | 024598273d0864e49467ad70abeb5aa42c422687 (patch) | |
| tree | f991fcaa2c48e46d8470e4846e709c0dc5b44e50 | |
| parent | 793152e1ef1307b111c875b4016abc8e61b47f05 (diff) | |
| parent | f48cb71993c864a4cedb83fe0d5c3df98c48d426 (diff) | |
| download | valgrind-024598273d0864e49467ad70abeb5aa42c422687.tar.gz | |
Merge "Add missing ioctls used by NFC."
| -rw-r--r-- | main/coregrind/m_syswrap/syswrap-linux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/coregrind/m_syswrap/syswrap-linux.c b/main/coregrind/m_syswrap/syswrap-linux.c index 526ff0c56..7c4a7901d 100644 --- a/main/coregrind/m_syswrap/syswrap-linux.c +++ b/main/coregrind/m_syswrap/syswrap-linux.c @@ -4299,11 +4299,14 @@ PRE(sys_ioctl) /* undocumented ioctl ids noted on the device */ case 0x4d07: case 0x6101: + case 0xfa01: /* used by NFC */ + case 0xfa05: /* used by NFC */ return; # elif defined(ANDROID_HARDWARE_nexus_7) /* undocumented ioctl ids noted on the device */ case 0x4e04: case 0x7231: + case 0x4004e901: /* used by NFC */ return; # endif |