arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-13 17:00:59 +00:00
Code Issues Releases Wiki Activity

prepare 1.3.4 release

Browse Source
This commit is contained in:
Pavol Rusnak 2015-08-03 19:10:46 +02:00
parent b678ba8811
commit 0c6b3e26e2
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -2,7 +2,7 @@
FROM ubuntu:14.04
ENV GCC_ARM_VERSION 4.9.3.2015q1-0trusty13
ENV GCC_ARM_VERSION 4.9.3.2015q2-1trusty1
# add and update package repositories
@ -21,5 +21,5 @@ RUN git clone https://github.com/libopencm3/libopencm3
# build libopencm3
ENV LIBOPENCM3_GITREV 7dbb93c78411b37bec64b5ca5be55076b0ab1b15
ENV LIBOPENCM3_GITREV 7b29caed1a726b5cef4c269b6a6ef7a1f1dd105c
RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make

2
firmware/trezor.h
View File

@ -22,7 +22,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 3
#define VERSION_PATCH 3
#define VERSION_PATCH 4
#define STR(X) #X
#define VERSTR(X) STR(X)

3
firmware/usb.c
View File

@ -227,8 +227,7 @@ static const char *usb_strings[] = {
(const char *)storage_uuid_str,
};
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len,
void (**complete)(usbd_device *, struct usb_setup_data *))
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, usbd_control_complete_callback *complete)
{
(void)complete;
(void)dev;

2
trezor-crypto

@ -1 +1 @@
Subproject commit 5ec72d3a5ba1aa6b7c7c907d7e2059b6c9a8a690
Subproject commit d659fd49a56992c8e903f7957bd3b221e3bc0f12