Skip to content

added error output for rt_rp1lib_init and rp1spi_init, now return zer… #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iforce2d wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added error output for rt_rp1lib_init and rp1spi_init, now return zer… #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions LinuxCNC/Components/Remora-spi/remora-spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,14 +783,20 @@ int rt_rp1lib_init(void)

inst = rp1_create_instance(chip, phys_addr, NULL);
if (!inst)
return -1;
{
rtapi_print_msg(RTAPI_MSG_ERR,"rp1_create_instance failed.\n");
return 0;
}

inst->phys_addr = phys_addr;

// map memory
inst->mem_fd = rtapi_open_as_root("/dev/mem", O_RDWR | O_SYNC);
if (inst->mem_fd < 0)
return errno;
{
rtapi_print_msg(RTAPI_MSG_ERR,"rtapi_open_as_root failed, errno = %d\n", errno);
return 0;
}

inst->priv = mmap(
NULL,
Expand All @@ -804,7 +810,10 @@ int rt_rp1lib_init(void)
DEBUG_PRINT("Base address: %11lx, size: %lx, mapped at address: %p\n", inst->phys_addr, RP1_BAR1_LEN, inst->priv);

if (inst->priv == MAP_FAILED)
return errno;
{
rtapi_print_msg(RTAPI_MSG_ERR,"mmap failed, errno = %d\n", errno);
return 0;
}

return 1;
}
Expand Down
16 changes: 8 additions & 8 deletions LinuxCNC/Components/Remora-spi/rp1lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ int rp1spi_init(uint8_t spi_num, uint8_t cs_num, uint8_t mode, uint32_t freq)
if (res.gpio_num != -1) {
DEBUG_PRINT("Pin: MOSI -> GPIO Number: %d, FSEL Number: %d\n", res.gpio_num, res.fsel_num);
} else {
return -1;
printf("Failed to get GPIO and FSEL for pin: %s\n", mosi_pin);
rtapi_print_msg(RTAPI_MSG_ERR, "Failed to get GPIO and FSEL for pin: %s\n", mosi_pin);
return 0;
}
gpio_set_fsel(res.gpio_num, res.fsel_num);
gpio_set_pull(res.gpio_num, PULL_NONE);
Expand All @@ -135,8 +135,8 @@ int rp1spi_init(uint8_t spi_num, uint8_t cs_num, uint8_t mode, uint32_t freq)
if (res.gpio_num != -1) {
DEBUG_PRINT("Pin: MISO -> GPIO Number: %d, FSEL Number: %d\n", res.gpio_num, res.fsel_num);
} else {
return -1;
printf("Failed to get GPIO and FSEL for pin: %s\n", miso_pin);
rtapi_print_msg(RTAPI_MSG_ERR, "Failed to get GPIO and FSEL for pin: %s\n", miso_pin);
return 0;
}
gpio_set_fsel(res.gpio_num, res.fsel_num);
gpio_set_pull(res.gpio_num, PULL_NONE);
Expand All @@ -146,8 +146,8 @@ int rp1spi_init(uint8_t spi_num, uint8_t cs_num, uint8_t mode, uint32_t freq)
if (res.gpio_num != -1) {
DEBUG_PRINT("Pin: SCLK -> GPIO Number: %d, FSEL Number: %d\n", res.gpio_num, res.fsel_num);
} else {
return -1;
printf("Failed to get GPIO and FSEL for pin: %s\n", sclk_pin);
rtapi_print_msg(RTAPI_MSG_ERR, "Failed to get GPIO and FSEL for pin: %s\n", sclk_pin);
return 0;
}
gpio_set_fsel(res.gpio_num, res.fsel_num);
gpio_set_pull(res.gpio_num, PULL_NONE);
Expand All @@ -157,8 +157,8 @@ int rp1spi_init(uint8_t spi_num, uint8_t cs_num, uint8_t mode, uint32_t freq)
if (res.gpio_num != -1) {
DEBUG_PRINT("Pin: CS -> GPIO Number: %d, FSEL Number: %d\n", res.gpio_num, res.fsel_num);
} else {
return -1;
printf("Failed to get GPIO and FSEL for pin: %s\n", cs_pin);
rtapi_print_msg(RTAPI_MSG_ERR, "Failed to get GPIO and FSEL for pin: %s\n", cs_pin);
return 0;
}
gpio_set_fsel(res.gpio_num, res.fsel_num);
gpio_set_pull(res.gpio_num, PULL_NONE);
Expand Down