cmds/intelana: rework without pkg/tools/ifd - this is faster

Signed-off-by: Daniel Maslowski <info@orangecms.org>

Author: orangecms

cmds/intelana/main.go

@@ -8,7 +8,6 @@ import (
 	"log"
 
 	fit "github.com/linuxboot/fiano/pkg/intel/metadata/fit"
-	ifd "github.com/linuxboot/fiano/pkg/tools"
 	"github.com/linuxboot/fiano/pkg/uefi"
 )
 
@@ -24,43 +23,34 @@ func main() {
 		}
 
 		fmt.Printf("\n== IFD ==\n")
-		o, s, err := ifd.GetRegion(data, uefi.RegionTypeBIOS)
-		if err != nil {
-			fmt.Printf("BIOS  region not found: %s\n", err)
-		} else {
-			fmt.Printf("BIOS  offset %x size %x\n", o, s)
-		}
-		o, s, err = ifd.GetRegion(data, uefi.RegionTypeME)
-		if err != nil {
-			fmt.Printf("ME    region not found: %s\n", err)
-		} else {
-			fmt.Printf("ME    offset %x size %x\n", o, s)
-		}
-		o, s, err = ifd.GetRegion(data, uefi.RegionTypeGBE)
-		if err != nil {
-			fmt.Printf("GBE   region not found: %s\n", err)
-		} else {
-			fmt.Printf("GBE   offset %x size %x\n", o, s)
-		}
-		o, s, err = ifd.GetRegion(data, uefi.RegionTypePTT)
-		if err != nil {
-			fmt.Printf("PTT   region not found: %s\n", err)
-		} else {
-			fmt.Printf("PTT   offset %x size %x\n", o, s)
+		regions := [...]uefi.FlashRegionType{
+			uefi.RegionTypeBIOS,
+			uefi.RegionTypeME,
+			uefi.RegionTypeGBE,
+			uefi.RegionTypePTT,
+			uefi.RegionTypeEC,
+			uefi.RegionTypeMicrocode,
 		}
-		o, s, err = ifd.GetRegion(data, uefi.RegionTypeEC)
-		if err != nil {
-			fmt.Printf("EC    region not found: %s\n", err)
-		} else {
-			fmt.Printf("EC    offset %x size %x\n", o, s)
-		}
-		o, s, err = ifd.GetRegion(data, uefi.RegionTypeMicrocode)
-		if err != nil {
-			fmt.Printf("ucode region not found: %s\n", err)
-		} else {
-			fmt.Printf("ucode offset %x size %x\n", o, s)
+
+		fi, err := uefi.NewFlashImage(data)
+		if fi != nil {
+			for _, r := range regions {
+				if fi.IFD.Region.FlashRegions[r].Valid() {
+					offset := fi.IFD.Region.FlashRegions[r].BaseOffset()
+					size := fi.IFD.Region.FlashRegions[r].EndOffset() - offset
+					fmt.Printf("%-5s  offset %x size %x\n", r, offset, size)
+				} else {
+					fmt.Printf("%-5s  region not found: %s\n", r, err)
+				}
+			}
 		}
 
+		/*
+			for _, r := range fi.IFD.Region.FlashRegions {
+				fmt.Printf("  %#v\n", r)
+			}
+		*/
+
 		doJson := false
 
 		fmt.Printf("\n== FIT ==\n")