Commit 4b2f1290 authored by Raptor Engineering Development Team's avatar Raptor Engineering Development Team
Browse files

Fix PWM driver device detect

parent 53d45730
...@@ -27,11 +27,11 @@ int initialize_pwm_controller(uint8_t *base_address) ...@@ -27,11 +27,11 @@ int initialize_pwm_controller(uint8_t *base_address)
{ {
return -1; return -1;
} }
uint32_t opencores_spi_version = *((volatile uint32_t *)(base_address + SIMPLE_PWM_MASTER_DEVICE_VERSION)); uint32_t pwm_controller_version = *((volatile uint32_t *)(base_address + SIMPLE_PWM_MASTER_DEVICE_VERSION));
KESTREL_LOG("OpenCores I2C master found, device version %0d.%0d.%d", KESTREL_LOG("PWM controller found, device version %0d.%0d.%d",
(opencores_spi_version >> SIMPLE_PWM_VERSION_MAJOR_SHIFT) & SIMPLE_PWM_VERSION_MAJOR_MASK, (pwm_controller_version >> SIMPLE_PWM_VERSION_MAJOR_SHIFT) & SIMPLE_PWM_VERSION_MAJOR_MASK,
(opencores_spi_version >> SIMPLE_PWM_VERSION_MINOR_SHIFT) & SIMPLE_PWM_VERSION_MINOR_MASK, (pwm_controller_version >> SIMPLE_PWM_VERSION_MINOR_SHIFT) & SIMPLE_PWM_VERSION_MINOR_MASK,
(opencores_spi_version >> SIMPLE_PWM_VERSION_PATCH_SHIFT) & SIMPLE_PWM_VERSION_PATCH_MASK); (pwm_controller_version >> SIMPLE_PWM_VERSION_PATCH_SHIFT) & SIMPLE_PWM_VERSION_PATCH_MASK);
{ {
KESTREL_LOG("Disabling PWM outputs"); KESTREL_LOG("Disabling PWM outputs");
......
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
#include <stdint.h> #include <stdint.h>
#define SIMPLE_PWM_MASTER_DEVICE_ID_LOW 0x0 #define SIMPLE_PWM_MASTER_DEVICE_ID_HIGH 0x0
#define SIMPLE_PWM_MASTER_DEVICE_ID_HIGH 0x4 #define SIMPLE_PWM_MASTER_DEVICE_ID_LOW 0x4
#define SIMPLE_PWM_MASTER_DEVICE_VERSION 0x8 #define SIMPLE_PWM_MASTER_DEVICE_VERSION 0x8
#define SIMPLE_PWM_MASTER_PWM_CTL 0xc #define SIMPLE_PWM_MASTER_PWM_CTL 0xc
#define SIMPLE_PWM_MASTER_TACH_01 0x10 #define SIMPLE_PWM_MASTER_TACH_01 0x10
#define SIMPLE_PWM_MASTER_TACH_23 0x14 #define SIMPLE_PWM_MASTER_TACH_23 0x14
#define SIMPLE_PWM_DEVICE_ID_HIGH 0x4932434d #define SIMPLE_PWM_DEVICE_ID_HIGH 0x7c525054
#define SIMPLE_PWM_DEVICE_ID_LOW 0x4f50574d #define SIMPLE_PWM_DEVICE_ID_LOW 0x5350574d
#define SIMPLE_PWM_VERSION_MAJOR_MASK 0xffff #define SIMPLE_PWM_VERSION_MAJOR_MASK 0xffff
#define SIMPLE_PWM_VERSION_MAJOR_SHIFT 16 #define SIMPLE_PWM_VERSION_MAJOR_SHIFT 16
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment