From b89666fb87820b0013a3b6d4003bfb762cd530ba Mon Sep 17 00:00:00 2001
From: Jan Pochyla <jpochyla@gmail.com>
Date: Tue, 15 Nov 2016 11:50:45 +0100
Subject: [PATCH] apps.debug: cleanup

---
 src/apps/common/storage.py |  4 +++
 src/apps/debug/__init__.py | 54 +++++++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/apps/common/storage.py b/src/apps/common/storage.py
index ab2025b87..6cb31d93c 100644
--- a/src/apps/common/storage.py
+++ b/src/apps/common/storage.py
@@ -49,6 +49,10 @@ def check_pin(pin: str) -> bool:
     return _get(_CFG_PIN) == pin
 
 
+def get_pin() -> str:
+    return _get(_CFG_PIN)
+
+
 def get_label() -> str:
     return _get(_CFG_LABEL)
 
diff --git a/src/apps/debug/__init__.py b/src/apps/debug/__init__.py
index ab0a8bcc5..ab21a1415 100644
--- a/src/apps/debug/__init__.py
+++ b/src/apps/debug/__init__.py
@@ -2,49 +2,67 @@ from trezor.wire import register_type, protobuf_handler
 from trezor.messages.wire_types import \
     DebugLinkDecision, DebugLinkGetState, DebugLinkStop, \
     DebugLinkMemoryRead, DebugLinkMemoryWrite, DebugLinkFlashErase
-from trezor.debug import memaccess
+
 
 async def dispatch_DebugLinkDecision(msg, session_id):
     # TODO: apply button decision from msg.yes_no
     pass
 
+
 async def dispatch_DebugLinkGetState(msg, session_id):
     from trezor.messages.DebugLinkState import DebugLinkState
-    f = DebugLinkState()
-    # TODO:
-    # f.pin = storage.get_pin()
+    from ..common import storage
+
+    m = DebugLinkState()
+    m.pin = storage.get_pin()
+    m.mnemonic = storage.get_mnemonic()
+    m.passphrase_protection = storage.is_protected_by_passphrase()
+    # TODO: handle other fields:
     # f.matrix = pinmatrix_get()
     # f.reset_entropy = reset_get_internal_entropy()
     # f.reset_word = reset_get_word()
     # f.recovery_fake_word = recovery_get_fake_word()
     # f.recovery_word_pos = recovery_get_word_pos()
-    # f.mnemonic = storage.get_mnemonic()
     # f.node = storage.get_node()
-    # f.passphrase_protection = storage.get_passphrase_protection()
-    await write_message(session_id, f)
+
+    return m
+
 
 async def dispatch_DebugLinkStop(msg, session_id):
     pass
 
+
 async def dispatch_DebugLinkMemoryRead(msg, session_id):
     from trezor.messages.DebugLinkMemory import DebugLinkMemory
-    length = max(msg.length, 1024)
-    f = DebugLinkMemory()
-    f.memory = memaccess(msg.address, length)
-    await write_message(session_id, f)
+    from trezor.debug import memaccess
+
+    length = min(msg.length, 1024)
+    m = DebugLinkMemory()
+    m.memory = memaccess(msg.address, length)
+
+    return m
+
 
 async def dispatch_DebugLinkMemoryWrite(msg, session_id):
-    # TODO memcpy((void *)msg.address, msg.memory, len(msg.memory))
+    # TODO: memcpy((void *)msg.address, msg.memory, len(msg.memory))
     pass
 
+
 async def dispatch_DebugLinkFlashErase(msg, session_id):
     # TODO: erase(msg.sector)
     pass
 
+
 def boot():
-    register_type(DebugLinkDecision, protobuf_handler, dispatch_DebugLinkDecision)
-    register_type(DebugLinkGetState, protobuf_handler, dispatch_DebugLinkGetState)
-    register_type(DebugLinkStop, protobuf_handler, dispatch_DebugLinkStop)
-    register_type(DebugLinkMemoryRead, protobuf_handler, dispatch_DebugLinkMemoryRead)
-    register_type(DebugLinkMemoryWrite, protobuf_handler, dispatch_DebugLinkMemoryWrite)
-    register_type(DebugLinkFlashErase, protobuf_handler, dispatch_DebugLinkFlashErase)
+    register_type(
+        DebugLinkDecision, protobuf_handler, dispatch_DebugLinkDecision)
+    register_type(
+        DebugLinkGetState, protobuf_handler, dispatch_DebugLinkGetState)
+    register_type(
+        DebugLinkStop, protobuf_handler, dispatch_DebugLinkStop)
+    register_type(
+        DebugLinkMemoryRead, protobuf_handler, dispatch_DebugLinkMemoryRead)
+    register_type(
+        DebugLinkMemoryWrite, protobuf_handler, dispatch_DebugLinkMemoryWrite)
+    register_type(
+        DebugLinkFlashErase, protobuf_handler, dispatch_DebugLinkFlashErase)