[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/42] usb: Remove unused functions
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 17/42] usb: Remove unused functions |
Date: |
Thu, 30 Apr 2015 08:08:30 +0300 |
From: Thomas Huth <address@hidden>
Delete set_usb_string(), usb_ep_get_ifnum(), usb_ep_get_max_packet_size()
usb_ep_get_max_streams() and usb_ep_set_pipeline() since they are
not used anymore.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/usb/core.c | 41 -----------------------------------------
include/hw/usb.h | 5 -----
2 files changed, 46 deletions(-)
diff --git a/hw/usb/core.c b/hw/usb/core.c
index cf34755..d0025db 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -331,23 +331,6 @@ void usb_generic_async_ctrl_complete(USBDevice *s,
USBPacket *p)
usb_packet_complete(s, p);
}
-/* XXX: fix overflow */
-int set_usb_string(uint8_t *buf, const char *str)
-{
- int len, i;
- uint8_t *q;
-
- q = buf;
- len = strlen(str);
- *q++ = 2 * len + 2;
- *q++ = 3;
- for(i = 0; i < len; i++) {
- *q++ = str[i];
- *q++ = 0;
- }
- return q - buf;
-}
-
USBDevice *usb_find_device(USBPort *port, uint8_t addr)
{
USBDevice *dev = port->dev;
@@ -749,12 +732,6 @@ void usb_ep_set_type(USBDevice *dev, int pid, int ep,
uint8_t type)
uep->type = type;
}
-uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep)
-{
- struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
- return uep->ifnum;
-}
-
void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum)
{
struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
@@ -782,12 +759,6 @@ void usb_ep_set_max_packet_size(USBDevice *dev, int pid,
int ep,
uep->max_packet_size = size * microframes;
}
-int usb_ep_get_max_packet_size(USBDevice *dev, int pid, int ep)
-{
- struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
- return uep->max_packet_size;
-}
-
void usb_ep_set_max_streams(USBDevice *dev, int pid, int ep, uint8_t raw)
{
struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
@@ -801,18 +772,6 @@ void usb_ep_set_max_streams(USBDevice *dev, int pid, int
ep, uint8_t raw)
}
}
-int usb_ep_get_max_streams(USBDevice *dev, int pid, int ep)
-{
- struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
- return uep->max_streams;
-}
-
-void usb_ep_set_pipeline(USBDevice *dev, int pid, int ep, bool enabled)
-{
- struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
- uep->pipeline = enabled;
-}
-
void usb_ep_set_halted(USBDevice *dev, int pid, int ep, bool halted)
{
struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);
diff --git a/include/hw/usb.h b/include/hw/usb.h
index 5be2937..c8b6e7b 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -445,15 +445,11 @@ void usb_ep_reset(USBDevice *dev);
void usb_ep_dump(USBDevice *dev);
struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep);
uint8_t usb_ep_get_type(USBDevice *dev, int pid, int ep);
-uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep);
void usb_ep_set_type(USBDevice *dev, int pid, int ep, uint8_t type);
void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum);
void usb_ep_set_max_packet_size(USBDevice *dev, int pid, int ep,
uint16_t raw);
-int usb_ep_get_max_packet_size(USBDevice *dev, int pid, int ep);
void usb_ep_set_max_streams(USBDevice *dev, int pid, int ep, uint8_t raw);
-int usb_ep_get_max_streams(USBDevice *dev, int pid, int ep);
-void usb_ep_set_pipeline(USBDevice *dev, int pid, int ep, bool enabled);
void usb_ep_set_halted(USBDevice *dev, int pid, int ep, bool halted);
USBPacket *usb_ep_find_packet_by_id(USBDevice *dev, int pid, int ep,
uint64_t id);
@@ -469,7 +465,6 @@ void usb_port_reset(USBPort *port);
void usb_device_reset(USBDevice *dev);
void usb_wakeup(USBEndpoint *ep, unsigned int stream);
void usb_generic_async_ctrl_complete(USBDevice *s, USBPacket *p);
-int set_usb_string(uint8_t *buf, const char *str);
/* usb-linux.c */
USBDevice *usb_host_device_open(USBBus *bus, const char *devname);
--
2.1.4
- [Qemu-devel] [PULL 13/42] qemu-options: trivial spelling fix (messsage), (continued)
- [Qemu-devel] [PULL 13/42] qemu-options: trivial spelling fix (messsage), Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 19/42] arm: cpu.h: Remove unused typdefs, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 40/42] kvm: Silence warning from valgrind, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 09/42] range: remove useless inclusions, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 01/42] tpm: Cast 64bit variables to int when used in DPRINTF, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 16/42] monitor: Remove unused functions, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 25/42] microblaze: mmu: Delete flip_um fn prototype, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 26/42] microblaze: cpu: Remote unused cpu_get_pc, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 42/42] microblaze: fix memory leak, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 41/42] tcg: Delete unused cpu_pc_from_tb(), Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 17/42] usb: Remove unused functions,
Michael Tokarev <=
- [Qemu-devel] [PULL 35/42] linux-user/elfload: use QTAILQ_FOREACH instead of open-coding it, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 31/42] cpus: use first_cpu macro instead of QTAILQ_FIRST(&cpus), Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 32/42] input: remove unused mouse_handlers list, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 24/42] defconfigs: Piggyback microblazeel on microblaze, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 29/42] microblaze: cpu: Renumber EXCP_* constants to close gap, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 39/42] vhost-user: remove superfluous '\n' around error_report(), Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 37/42] qmp-commands: Fix typo, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 06/42] ui/console : remove 'struct' from 'typedef struct' type, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 23/42] libcacard: do not use full paths for include files in the same dir, Michael Tokarev, 2015/04/30
- [Qemu-devel] [PULL 04/42] ui/vnc : fix coding style, Michael Tokarev, 2015/04/30