diff --git a/README.md b/README.md index 69aeebb..4b8b08a 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Depending on the contents of each BIOS, the following tags may be displayed on t * **ACPI**: Appears to contain an ACPI table. Does not necessarily indicate ACPI actually works. * **Adaptec**: Adaptec ISA or PCI SCSI option ROM. -* **NCR3/4**: NCR PCI SCSI option ROM with SDMS version 3 or 4 (respectively). +* **NCR3/4**: NCR/Symbios PCI SCSI option ROM with SDMS version 3 or 4 (respectively). * **PXE**: PXE-compliant network boot ROM, usually associated with on-board Ethernet. * **RPL**: Novell NetWare RPL-compliant network boot ROM, usually associated with on-board Ethernet. * **SLI**: NVIDIA SLI license for non-nForce motherboards. diff --git a/biostools/analyzers.py b/biostools/analyzers.py index 0a4f689..64388e5 100644 --- a/biostools/analyzers.py +++ b/biostools/analyzers.py @@ -1724,9 +1724,10 @@ class PhoenixAnalyzer(Analyzer): return True def _version_40x(self, line, match): - '''Phoenix(?:(MB)(?: BIOS)?| ?BIOS(?: (Developmental))?) (Version +([0-9]\.[0-9]+)|4\.0[0-9])(.+)?''' + '''Phoenix(?:(MB)(?: BIOS)?| ?BIOS(?: (Developmental))?) (?:Plug and Play )?(Version +([0-9]\.[0-9]+)|4\.0[0-9])(.+)?''' # Detect just 4.0x without the "Version" prefix to detect some weird # OEM ones (Zenith Z-Station GT) while not causing false positives. + # "Plug and Play" = ALR Sequel series # Extract version. self.version = match.group(4) or match.group(3) @@ -2103,7 +2104,7 @@ class QuadtelAnalyzer(Analyzer): version_string = util.read_string(file_data[id_block_index + 0xc8:id_block_index + 0x190]) version_match = self._version_pattern.search(version_string) # may start with a linebreak (Phoenix-Quadtel) if version_match: - self.version = version_match.group(2).replace(' \b', '').rstrip('.').strip() # remove trailing "." (quadt286) and space followed by backspace (ZEOS Marlin) + self.version = version_match.group(2).replace(' \b', '').rstrip('.').strip().rstrip('.') # remove trailing "." (first for quadt286, second for Quadtel GC113) and space followed by backspace (ZEOS Marlin) if self.version[0:1] == 'Q': # flag Phoenix-Quadtel self.version = self.version[1:] + ' (Phoenix)'