From bc7c66aa763858fa751e8f6353a8e18a776da65c Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 4 Dec 2017 22:30:11 +0100
Subject: [PATCH] add Features.model field (set to "1")

---
 bootloader/usb.c                 | 7 +++++--
 firmware/fsm.c                   | 1 +
 firmware/protob/messages.options | 1 +
 vendor/trezor-common             | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bootloader/usb.c b/bootloader/usb.c
index d3498dbd0..24e88983f 100644
--- a/bootloader/usb.c
+++ b/bootloader/usb.c
@@ -227,6 +227,7 @@ static void send_msg_features(usbd_device *dev)
 	//           - patch_version = VERSION_PATCH
 	//           - bootloader_mode = True
 	//           - firmware_present = True/False
+	//           - model = "1"
 	if (brand_new_firmware) {
 		while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN,
 			// header
@@ -242,8 +243,9 @@ static void send_msg_features(usbd_device *dev)
 			"\x20" VERSION_PATCH_CHAR
 			"\x28" "\x01"
 			"\x90\x01" "\x00"
+			"\xaa" "\x01" "1"
 			// padding
-			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 			, 64) != 64) {}
 	} else {
 		while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN,
@@ -260,8 +262,9 @@ static void send_msg_features(usbd_device *dev)
 			"\x20" VERSION_PATCH_CHAR
 			"\x28" "\x01"
 			"\x90\x01" "\x01"
+			"\xaa" "\x01" "1"
 			// padding
-			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 			, 64) != 64) {}
 	}
 }
diff --git a/firmware/fsm.c b/firmware/fsm.c
index 2a79ee430..a4c48aa64 100644
--- a/firmware/fsm.c
+++ b/firmware/fsm.c
@@ -267,6 +267,7 @@ void fsm_msgGetFeatures(GetFeatures *msg)
 	resp->has_passphrase_cached = true; resp->passphrase_cached = session_isPassphraseCached();
 	resp->has_needs_backup = true; resp->needs_backup = storage_needsBackup();
 	resp->has_flags = true; resp->flags = storage_getFlags();
+	resp->has_model = true; strlcpy(resp->model, "1", sizeof(resp->model));
 	msg_write(MessageType_MessageType_Features, resp);
 }
 
diff --git a/firmware/protob/messages.options b/firmware/protob/messages.options
index 87f8869fa..cbd4f007c 100644
--- a/firmware/protob/messages.options
+++ b/firmware/protob/messages.options
@@ -5,6 +5,7 @@ Features.label				max_size:33
 Features.coins				max_count:15
 Features.revision			max_size:20
 Features.bootloader_hash		max_size:32
+Features.model				max_size:17
 
 ApplySettings.language			max_size:17
 ApplySettings.label			max_size:33
diff --git a/vendor/trezor-common b/vendor/trezor-common
index dc181b97b..8e96b4226 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit dc181b97b864cc667a11f7a82f2ef43eedb585a4
+Subproject commit 8e96b42260b84e1e0f0b00a5e528d19258c57031