From e523d3cfc19042fd61bc09cb10935947dfd16c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 2 Mar 2011 18:49:02 +0000 Subject: [PATCH] changed ioctl hook return code when the opcode isn't supported. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40786 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp | 2 +- src/add-ons/kernel/bus_managers/firewire/fwohci.cpp | 2 +- src/add-ons/kernel/bus_managers/ide/ide_sim.c | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.c | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c | 2 +- src/add-ons/kernel/bus_managers/scsi/devices.cpp | 2 +- src/add-ons/kernel/busses/scsi/ahci/ahci_sim.cpp | 2 +- src/add-ons/kernel/busses/scsi/usb/usb_scsi.c | 2 +- src/add-ons/kernel/generic/scsi_periph/io.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp b/src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp index aaa657d2f8..2640920a85 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp @@ -268,7 +268,7 @@ static status_t acpi_namespace_control(void* cookie, uint32 op, void* arg, size_t len) { dprintf("acpi_ns_dump: device_control\n"); - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } diff --git a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp index 7749bce24e..aea85f80b7 100644 --- a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp +++ b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp @@ -394,7 +394,7 @@ fwohci_ioctl (void *cookie, u_long cmd, void *data, size_t len) err = EINVAL; break; default: - err = EINVAL; + err = ENOTTY; break; } return err; diff --git a/src/add-ons/kernel/bus_managers/ide/ide_sim.c b/src/add-ons/kernel/bus_managers/ide/ide_sim.c index 8e20272c9c..0f400db5f5 100644 --- a/src/add-ons/kernel/bus_managers/ide/ide_sim.c +++ b/src/add-ons/kernel/bus_managers/ide/ide_sim.c @@ -750,7 +750,7 @@ ide_sim_ioctl(ide_bus_info *bus, uint8 targetID, uint32 op, void *buffer, size_t } } - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp index 0eb8fcb17c..bfd492bfb3 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp @@ -508,7 +508,7 @@ keyboard_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) default: INFO("ps2: invalid ioctl 0x%lx\n", op); - return EINVAL; + return B_DEV_INVALID_IOCTL; } } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.c b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.c index d6833b2760..6b21ce723e 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.c @@ -510,7 +510,7 @@ standard_mouse_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) default: TRACE("ps2: ioctl unknown mouse opcode: %ld\n", op); - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c index 0a8aa1c1b0..ba190235a7 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c @@ -767,7 +767,7 @@ synaptics_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) default: TRACE("SYNAPTICS: unknown opcode: %ld\n", op); - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } } diff --git a/src/add-ons/kernel/bus_managers/scsi/devices.cpp b/src/add-ons/kernel/bus_managers/scsi/devices.cpp index c86e05f75f..1b760af8bd 100644 --- a/src/add-ons/kernel/bus_managers/scsi/devices.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/devices.cpp @@ -471,7 +471,7 @@ scsi_ioctl(scsi_device_info *device, uint32 op, void *buffer, size_t length) device->target_id, op, buffer, length); } - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.cpp index 6042cbe1c7..6b1352a7e0 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.cpp @@ -115,7 +115,7 @@ ahci_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer, size_t length) { TRACE("ahci_ioctl, cookie %p\n", cookie); - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } diff --git a/src/add-ons/kernel/busses/scsi/usb/usb_scsi.c b/src/add-ons/kernel/busses/scsi/usb/usb_scsi.c index 5c5827744a..3629d750cf 100644 --- a/src/add-ons/kernel/busses/scsi/usb/usb_scsi.c +++ b/src/add-ons/kernel/busses/scsi/usb/usb_scsi.c @@ -1165,7 +1165,7 @@ static status_t module_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer, size_t length) { TRACE_ALWAYS("ioctl\n"); - return B_ERROR; + return B_DEV_INVALID_IOCTL; } diff --git a/src/add-ons/kernel/generic/scsi_periph/io.cpp b/src/add-ons/kernel/generic/scsi_periph/io.cpp index c110e9dbcd..5ce77856ea 100644 --- a/src/add-ons/kernel/generic/scsi_periph/io.cpp +++ b/src/add-ons/kernel/generic/scsi_periph/io.cpp @@ -332,7 +332,7 @@ periph_ioctl(scsi_periph_handle_info *handle, int op, void *buffer, } SHOW_ERROR(4, "Unknown ioctl: %x", op); - return B_BAD_VALUE; + return B_DEV_INVALID_IOCTL; } }