asahi_firmware: Configure logging

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

asahi_firmware/bluetooth.py

@@ -4,6 +4,8 @@
 
 from .core import FWFile
 
+log = logging.getLogger("asahi_firmware.bluetooth")
+
 BluetoothChip = namedtuple(
     "BluetoothChip", ("chip", "stepping", "board_type", "vendor")
 )
@@ -42,7 +44,7 @@ def load(self, source_path):
                 continue
 
             if self.fwfiles[chip][idx] is not None:
-                logging.warning(f"duplicate entry for {chip}: {self.fwfiles[chip][idx].name} and now {fname + ext}")
+                log.warning(f"duplicate entry for {chip}: {self.fwfiles[chip][idx].name} and now {fname + ext}")
                 continue
 
             path = os.path.join(source_path, fname)
@@ -56,15 +58,15 @@ def parse_fname(self, fname):
 
         match = re.fullmatch("bcm(43[0-9]{2})([a-z][0-9])", fname[0].lower())
         if not match:
-            logging.warning(f"Unexpected firmware file: {fname}")
+            log.warning(f"Unexpected firmware file: {fname}")
             return None
         chip, stepping = match.groups()
 
         # board type is either preceeded by PCIE_macOS or by PCIE
         try:
             pcie_offset = fname.index("PCIE")
         except:
-            logging.warning(f"Can't find board type in {fname}")
+            log.warning(f"Can't find board type in {fname}")
             return None
 
         if fname[pcie_offset + 1] == "macOS":
@@ -79,7 +81,7 @@ def parse_fname(self, fname):
             if vendor in fname:
                 otp_values.add(otp_value)
         if len(otp_values) != 1:
-            logging.warning(f"Unable to determine vendor ({otp_values}) in {fname}")
+            log.warning(f"Unable to determine vendor ({otp_values}) in {fname}")
             return None
         vendor = otp_values.pop()
 
@@ -94,13 +96,13 @@ def files(self):
                 fname_base += f"-{chip.vendor}"
 
             if bin is None:
-                logging.warning(f"no bin for {chip}")
+                log.warning(f"no bin for {chip}")
                 continue
             else:
                 yield fname_base + ".bin", bin
 
             if ptb is None:
-                logging.warning(f"no ptb for {chip}")
+                log.warning(f"no ptb for {chip}")
                 continue
             else:
                 yield fname_base + ".ptb", ptb

asahi_firmware/update.py

@@ -26,6 +26,8 @@ def update_firmware(source, dest, manifest):
 
 if __name__ == "__main__":
     import argparse
+    import logging
+    logging.basicConfig()
 
     parser = argparse.ArgumentParser(description='Update vendor firmware tarball')
     parser.add_argument('source', metavar='DIR', type=pathlib.Path,

asahi_firmware/wifi.py

@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: MIT
 import sys, os, os.path, pprint, statistics, logging
-
 from .core import FWFile
 
+log = logging.getLogger("asahi_firmware.wifi")
+
 class FWNode(object):
     def __init__(self, this=None, leaves=None):
         if leaves is None: