projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/scheme: add list-copy
[fw/altos]
/
src
/
stmf0
/
ao_usb_stm.c
diff --git
a/src/stmf0/ao_usb_stm.c
b/src/stmf0/ao_usb_stm.c
index 6393ee4477eb2d1a1ef40d98e31cbab3ecc4a02f..59aed3aa8ebec1435e21db3f8e65b01b4aacc69e 100644
(file)
--- a/
src/stmf0/ao_usb_stm.c
+++ b/
src/stmf0/ao_usb_stm.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-184,7
+185,7
@@
static inline uint32_t set_toggle(uint32_t current_value,
static inline uint16_t *ao_usb_packet_buffer_addr(uint16_t sram_addr)
{
static inline uint16_t *ao_usb_packet_buffer_addr(uint16_t sram_addr)
{
- return (uint16_t *) (stm_usb_sram + sram_addr);
+ return (uint16_t *) (
void *) (
stm_usb_sram + sram_addr);
}
static inline uint16_t ao_usb_packet_buffer_offset(uint16_t *addr)
}
static inline uint16_t ao_usb_packet_buffer_offset(uint16_t *addr)
@@
-654,7
+655,7
@@
ao_usb_ep0_in_start(uint16_t max)
ao_usb_ep0_flush();
}
ao_usb_ep0_flush();
}
-st
atic st
ruct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
+struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
#if AO_USB_DEVICE_ID_SERIAL
static uint8_t ao_usb_serial[2 + 48];
#if AO_USB_DEVICE_ID_SERIAL
static uint8_t ao_usb_serial[2 + 48];
@@
-1191,14
+1192,6
@@
ao_usb_alloc(void)
return buffer;
}
return buffer;
}
-void
-ao_usb_free(uint16_t *addr)
-{
- uint16_t offset = ao_usb_packet_buffer_offset(addr);
- if (offset < ao_usb_sram_addr)
- ao_usb_sram_addr = offset;
-}
-
void
ao_usb_write(uint16_t *buffer, uint16_t len)
{
void
ao_usb_write(uint16_t *buffer, uint16_t len)
{