Skip to content

[TOPIC-GPIO] samples/bluetooth: hci_spi: convert to new GPIO API #22134

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

Merged
merged 1 commit into from
Jan 26, 2020
Merged

[TOPIC-GPIO] samples/bluetooth: hci_spi: convert to new GPIO API #22134

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
2 changes: 1 addition & 1 deletion boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
bt-hci@0 {
compatible = "zephyr,bt-hci-spi-slave";
reg = <0>;
irq-gpios = <&gpio0 28 0>;
irq-gpios = <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
};
};
35 changes: 18 additions & 17 deletions samples/bluetooth/hci_spi/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,29 @@
#define LOG_MODULE_NAME hci_spi
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

#define HCI_CMD 0x01
#define HCI_ACL 0x02
#define HCI_SCO 0x03
#define HCI_EVT 0x04
#define HCI_CMD 0x01
#define HCI_ACL 0x02
#define HCI_SCO 0x03
#define HCI_EVT 0x04

/* Special Values */
#define SPI_WRITE 0x0A
#define SPI_READ 0x0B
#define READY_NOW 0x02
#define SANITY_CHECK 0x02
#define SPI_WRITE 0x0A
#define SPI_READ 0x0B
#define READY_NOW 0x02
#define SANITY_CHECK 0x02

/* Offsets */
#define STATUS_HEADER_READY 0
#define STATUS_HEADER_TOREAD 3
#define STATUS_HEADER_READY 0
#define STATUS_HEADER_TOREAD 3

#define PACKET_TYPE 0
#define EVT_BLUE_INITIALIZED 0x01
#define PACKET_TYPE 0
#define EVT_BLUE_INITIALIZED 0x01

#define GPIO_IRQ_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_IRQ_GPIOS_PIN
#define GPIO_IRQ_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_IRQ_GPIOS_PIN
#define GPIO_IRQ_FLAGS DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_IRQ_GPIOS_FLAGS

/* Needs to be aligned with the SPI master buffer size */
#define SPI_MAX_MSG_LEN 255
#define SPI_MAX_MSG_LEN 255

static u8_t rxmsg[SPI_MAX_MSG_LEN];
static struct spi_buf rx;
Expand Down Expand Up @@ -131,7 +132,7 @@ static inline int spi_send(struct net_buf *buf)
}
header_slave[STATUS_HEADER_TOREAD] = buf->len;

gpio_pin_write(gpio_dev, GPIO_IRQ_PIN, 1);
gpio_pin_set(gpio_dev, GPIO_IRQ_PIN, 1);

/* Coordinate transfer lock with the spi rx thread */
k_sem_take(&sem_spi_tx, K_FOREVER);
Expand All @@ -156,7 +157,7 @@ static inline int spi_send(struct net_buf *buf)
}
net_buf_unref(buf);

gpio_pin_write(gpio_dev, GPIO_IRQ_PIN, 0);
gpio_pin_set(gpio_dev, GPIO_IRQ_PIN, 0);
k_sem_give(&sem_spi_rx);

return 0;
Expand Down Expand Up @@ -282,7 +283,7 @@ static int hci_spi_init(struct device *unused)
return -EINVAL;
}
gpio_pin_configure(gpio_dev, GPIO_IRQ_PIN,
GPIO_DIR_OUT | GPIO_PUD_PULL_DOWN);
GPIO_OUTPUT_INACTIVE | GPIO_IRQ_FLAGS);

return 0;
}
Expand Down