boards: up_squared_adsp: Update logging frontend

Update frontend moving general library code to appropriate place.

Signed-off-by: Andrei Emeltchenko <[email protected]>

Author: finikorg

boards/xtensa/up_squared_adsp/tools/lib/loglist.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from ctypes import string_at
+
+MAGIC = 0x55aa
+SLOT_LEN = 64
+SLOT_NUM = int(8192 / SLOT_LEN)
+
+def read_bytes(buffer):
+    return int.from_bytes(buffer, byteorder='little')
+
+class Loglist:
+    """Loglist class"""
+
+    def __init__(self, argument):
+        """Constructor for the loglist takes argument filename or buffer"""
+
+        if isinstance(argument, str):
+            f = open(argument, "rb")
+            self.buffer = f.read(SLOT_NUM * SLOT_LEN)
+        elif isinstance(argument, int):
+            self.buffer = string_at(argument, SLOT_NUM * SLOT_LEN)
+        else:
+            return
+
+        self.loglist = []
+        self.parse()
+
+    def parse_slot(self, slot):
+        magic = read_bytes(slot[0:2])
+
+        if magic == MAGIC:
+            id_num = read_bytes(slot[2:4])
+            logstr = slot[4:].decode(errors='replace').split('\r', 1)[0]
+            self.loglist.append((id_num, logstr))
+
+    def parse(self):
+        for x in range(0, SLOT_NUM):
+            slot = self.buffer[x * SLOT_LEN : (x + 1) * SLOT_LEN]
+            self.parse_slot(slot)
+
+    def print(self):
+        for pair in sorted(self.loglist):
+            print('{} : {}'.format(*pair))

boards/xtensa/up_squared_adsp/tools/logtool.py

@@ -9,58 +9,11 @@
 import argparse
 import os
 import sys
-from ctypes import string_at
+from lib.loglist import Loglist
 
 QEMU_ETRACE = "/dev/shm/qemu-bridge-hp-sram-mem"
 SOF_ETRACE = "/sys/kernel/debug/sof/etrace"
 
-QEMU_OFFSET = 0x8000
-SOF_OFFSET = 0x0
-
-MAGIC = 0x55aa
-SLOT_LEN = 64
-SLOT_NUM = int(8192 / SLOT_LEN)
-
-
-def read_bytes(buffer):
-    return int.from_bytes(buffer, byteorder='little')
-
-
-class Loglist:
-    """Loglist class"""
-
-    def __init__(self, argument):
-        """Constructor for the loglist takes argument filename or buffer"""
-
-        if isinstance(argument, str):
-            f = open(argument, "rb")
-            self.buffer = f.read(SLOT_NUM * SLOT_LEN)
-        elif isinstance(argument, int):
-            self.buffer = string_at(argument, SLOT_NUM * SLOT_LEN)
-        else:
-            return
-
-        self.loglist = []
-        self.parse()
-
-    def parse_slot(self, slot):
-        magic = read_bytes(slot[0:2])
-
-        if magic == MAGIC:
-            id_num = read_bytes(slot[2:4])
-            logstr = slot[4:].decode(errors='replace').split('\r', 1)[0]
-            self.loglist.append((id_num, logstr))
-
-    def parse(self):
-        for x in range(0, SLOT_NUM):
-            slot = self.buffer[x * SLOT_LEN : (x + 1) * SLOT_LEN]
-            self.parse_slot(slot)
-
-    def print(self):
-        for pair in sorted(self.loglist):
-            print('{} : {}'.format(*pair))
-
-
 def parse_args():
     """Parsing command line arguments"""