Skip to content

Commit 36b1ade

Browse files
committed
fix:Simplify FirmwareExists() function
Signed-off-by: Yejin Seo <yejseo01@arm.com>
1 parent c3d4e03 commit 36b1ade

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

pkg/simulator/filesystem.go

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"os"
66
"path/filepath"
7-
"strings"
87
)
98

109
type FileSystemManager struct {
@@ -19,7 +18,7 @@ func NewFileSystemManager(rootDir string, index uint) *FileSystemManager {
1918
return &FileSystemManager{
2019
instanceDir: filepath.Join(rootDir, "sys", "class", "remoteproc", instanceName),
2120
firmwareDirPathFile: filepath.Join(rootDir, "sys", "module", "firmware_class", "parameters", "path"),
22-
firmwareDir: filepath.Join(rootDir, "userhome", "firmware"),
21+
firmwareDir: filepath.Join(rootDir, "firmware"),
2322
createdDirs: []string{},
2423
}
2524
}
@@ -38,10 +37,8 @@ func (fs *FileSystemManager) BootstrapDirectories() error {
3837
fs.Cleanup()
3938
return fmt.Errorf("failed to create firmware path directory: %w", err)
4039
}
41-
if createdFirmwareDirPathFileFolder != "" {
42-
fs.createdDirs = append(fs.createdDirs, createdFirmwareDirPathFileFolder)
43-
}
44-
// Write Firmware path
40+
fs.createdDirs = append(fs.createdDirs, createdFirmwareDirPathFileFolder)
41+
4542
if err := os.WriteFile(fs.firmwareDirPathFile, []byte(fs.firmwareDir), 0644); err != nil {
4643
fs.Cleanup()
4744
return fmt.Errorf("failed to write firmware path file: %w", err)
@@ -52,9 +49,7 @@ func (fs *FileSystemManager) BootstrapDirectories() error {
5249
fs.Cleanup()
5350
return fmt.Errorf("failed to create firmware directory: %w", err)
5451
}
55-
if createdFirmwareDir != "" {
56-
fs.createdDirs = append(fs.createdDirs, createdFirmwareDir)
57-
}
52+
fs.createdDirs = append(fs.createdDirs, createdFirmwareDir)
5853

5954
return nil
6055
}
@@ -69,19 +64,8 @@ func (fs *FileSystemManager) WriteInstanceFile(filename, content string) error {
6964
}
7065

7166
func (fs *FileSystemManager) FirmwareExists(firmwareName string) bool {
72-
firmwareDir, err := os.ReadFile(fs.firmwareDirPathFile) // simulate reading the firmware path
73-
if err != nil {
74-
fmt.Printf("failed to read firmware dir path: %v\n", err)
75-
return false
76-
}
77-
firmwareDirStr := strings.TrimSpace(string(firmwareDir))
78-
if firmwareDirStr != fs.firmwareDir {
79-
fmt.Printf("firmware path mismatch: expected %s from /sys/module/firmware_class/parameters/path, got %s\n", fs.firmwareDir, firmwareDirStr)
80-
return false
81-
}
82-
8367
path := filepath.Join(fs.firmwareDir, firmwareName)
84-
_, err = os.Stat(path)
68+
_, err := os.Stat(path)
8569
return !os.IsNotExist(err)
8670
}
8771

0 commit comments

Comments
 (0)