diff options
Diffstat (limited to 'util/pinmap/readers')
-rw-r--r-- | util/pinmap/readers/csv/csv.go | 10 | ||||
-rw-r--r-- | util/pinmap/readers/csv/csv_test.go | 5 | ||||
-rw-r--r-- | util/pinmap/readers/csv/testdata/data.csv | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/util/pinmap/readers/csv/csv.go b/util/pinmap/readers/csv/csv.go index 3f541f5da6..562b5c6383 100644 --- a/util/pinmap/readers/csv/csv.go +++ b/util/pinmap/readers/csv/csv.go @@ -82,20 +82,16 @@ func (r *CSVReader) Read(columnKey, filepath string) (*pm.Pins, error) { p := new(pm.Pin) switch row[ptype] { default: - fmt.Printf("%s:%d: Unknown signal type (%s) - ignored", filepath, i+1, row[ptype]) + fmt.Printf("%s:%d: Unknown signal type (%s) - ignored\n", filepath, i+1, row[ptype]) continue case "OTHER": + case "PWM": + case "PWM_INVERT": // Skipped continue case "ADC": p.PinType = pm.ADC pins.Adc = append(pins.Adc, p) - case "PWM": - p.PinType = pm.PWM - pins.Pwm = append(pins.Pwm, p) - case "PWM_INVERT": - p.PinType = pm.PWM_INVERT - pins.Pwm = append(pins.Pwm, p) case "I2C_DATA": // Only the clock pin is used for the config continue diff --git a/util/pinmap/readers/csv/csv_test.go b/util/pinmap/readers/csv/csv_test.go index 639ec4f8fe..c0a79ba784 100644 --- a/util/pinmap/readers/csv/csv_test.go +++ b/util/pinmap/readers/csv/csv_test.go @@ -38,15 +38,10 @@ func TestName(t *testing.T) { &pm.Pin{pm.OutputODL, "F6", "EC_GPIO_3", ""}, &pm.Pin{pm.InputPU, "K10", "EC_GPIO_4", ""}, }, - Pwm: []*pm.Pin{ - &pm.Pin{pm.PWM, "C3", "EC_PWM_1", "FAN_1"}, - &pm.Pin{pm.PWM_INVERT, "J9", "EC_PWM_2", "LED_1"}, - }, } check(t, "ADc", exp.Adc, pins.Adc) check(t, "I2c", exp.I2c, pins.I2c) check(t, "Gpio", exp.Gpio, pins.Gpio) - check(t, "Pwm", exp.Pwm, pins.Pwm) } func check(t *testing.T, name string, exp, got []*pm.Pin) { diff --git a/util/pinmap/readers/csv/testdata/data.csv b/util/pinmap/readers/csv/testdata/data.csv index 6c7ac5ace9..8f1be84801 100644 --- a/util/pinmap/readers/csv/testdata/data.csv +++ b/util/pinmap/readers/csv/testdata/data.csv @@ -1,8 +1,6 @@ Signal Name,MyCHIP,Type,Enum EC_ADC_1,A1,ADC,ENUM_ADC_1 EC_IGNORED_1,B2,OTHER, -EC_PWM_1,C3,PWM,FAN_1 -EC_PWM_2,J9,PWM_INVERT,LED_1 EC_GPIO_1,D4,INPUT,GPIO1 EC_GPIO_2,E5,OUTPUT,GPIO2 EC_GPIO_3,F6,OUTPUT_ODL, |