Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1136-g9a150e326
|
From: openocd-gerrit <ope...@us...> - 2025-08-17 13:37:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 9a150e326a655c9bd2fbead1be43748ca640764c (commit)
from ceaa47a2aa86ac476400683f3d78519f1ea79d5a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9a150e326a655c9bd2fbead1be43748ca640764c
Author: Ahmed BOUDJELIDA <abo...@na...>
Date: Thu Dec 12 10:27:14 2024 +0100
contrib/firmware/angie: add dev-board power detection
Add a check if i2c SDA pin state is HIGH.
if its HIGH, the dev-board is ON, we receive
number of Ack.
in its LOW, the board is OFF, we send this
information back to driver.
Change-Id: Ia40d3910675cc10e0208d8bc0060a19c12b1409d
Signed-off-by: Ahmed BOUDJELIDA <abo...@na...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8716
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/contrib/firmware/angie/c/include/i2c.h b/contrib/firmware/angie/c/include/i2c.h
index d0404923b..7a199c15a 100644
--- a/contrib/firmware/angie/c/include/i2c.h
+++ b/contrib/firmware/angie/c/include/i2c.h
@@ -14,6 +14,7 @@
#include <stdint.h>
#include <stdio.h>
+bool get_status(void);
void start_cd(void);
void repeated_start(void);
void stop_cd(void);
diff --git a/contrib/firmware/angie/c/src/i2c.c b/contrib/firmware/angie/c/src/i2c.c
index 9aadc2c25..4cf82955f 100644
--- a/contrib/firmware/angie/c/src/i2c.c
+++ b/contrib/firmware/angie/c/src/i2c.c
@@ -12,6 +12,19 @@
#include "delay.h"
#include "reg_ezusb.h"
+bool get_status(void)
+{
+ PIN_SDA_DIR = 1;
+ OEA = 0xF7;
+ delay_us(1);
+ bool sda_state = PIN_SDA;
+ PIN_T0 = sda_state;
+ delay_us(1);
+ OEA = 0xFF;
+ delay_us(1);
+ return sda_state;
+}
+
void start_cd(void)
{
PIN_SDA_DIR = 0; // SP6 SDA: OUT
diff --git a/contrib/firmware/angie/c/src/main.c b/contrib/firmware/angie/c/src/main.c
index 042a1eca7..657694b6c 100644
--- a/contrib/firmware/angie/c/src/main.c
+++ b/contrib/firmware/angie/c/src/main.c
@@ -11,9 +11,9 @@
*****************************************************************************/
#include "usb.h"
+#include "serial.h"
#include "delay.h"
#include "reg_ezusb.h"
-#include <serial.h>
#include <stdio.h>
extern void sudav_isr(void)__interrupt SUDAV_ISR;
diff --git a/contrib/firmware/angie/c/src/usb.c b/contrib/firmware/angie/c/src/usb.c
index f3bc99ba1..9b48e8353 100644
--- a/contrib/firmware/angie/c/src/usb.c
+++ b/contrib/firmware/angie/c/src/usb.c
@@ -55,7 +55,7 @@ __code struct usb_config_descriptor config_descriptor = {
((NUM_ENDPOINTS * 2) * sizeof(struct usb_endpoint_descriptor)),
.bnuminterfaces = 2,
.bconfigurationvalue = 1,
- .iconfiguration = 4, /* String describing this configuration */
+ .iconfiguration = 2, /* String describing this configuration */
.bmattributes = 0x80, /* Only MSB set according to USB spec */
.maxpower = 50 /* 100 mA */
};
@@ -69,7 +69,7 @@ __code struct usb_interface_descriptor interface_descriptor00 = {
.binterfaceclass = 0XFF,
.binterfacesubclass = 0x00,
.binterfaceprotocol = 0x00,
- .iinterface = 5
+ .iinterface = 0
};
__code struct usb_endpoint_descriptor bulk_ep2_endpoint_descriptor = {
@@ -99,7 +99,7 @@ __code struct usb_interface_descriptor interface_descriptor01 = {
.binterfaceclass = 0x0A,
.binterfacesubclass = 0x00,
.binterfaceprotocol = 0x00,
- .iinterface = 6
+ .iinterface = 0
};
__code struct usb_endpoint_descriptor bulk_ep6_out_endpoint_descriptor = {
@@ -200,8 +200,8 @@ void ep6_isr(void)__interrupt EP6_ISR
}
void ep8_isr(void)__interrupt EP8_ISR
{
- EXIF &= ~0x10; /* Clear USBINT: Main global interrupt */
- EPIRQ = 0x80; /* Clear individual EP8IN IRQ */
+ EXIF &= ~0x10; /* Clear USBINT: Main global interrupt */
+ EPIRQ = 0x80; /* Clear individual EP8IN IRQ */
}
void ibn_isr(void)__interrupt IBN_ISR
{
@@ -761,16 +761,16 @@ void ep_init(void)
void i2c_recieve(void)
{
- PIN_SDA_DIR = 0;
if (EP6FIFOBUF[0] == 1) {
- uint8_t rdwr = EP6FIFOBUF[0]; //read
- uint8_t data_count = EP6FIFOBUF[1]; //data sent count
+ uint8_t rdwr = EP6FIFOBUF[0]; //read: 1
+ uint8_t reg_byte_check = EP6FIFOBUF[1]; //register given: 1 else: 0
uint8_t count = EP6FIFOBUF[2]; //requested data count
uint8_t adr = EP6FIFOBUF[3]; //address
uint8_t address = get_address(adr, rdwr); //address byte (read command)
uint8_t address_2 = get_address(adr, 0); //address byte 2 (write command)
- printf("%d\n", address - 1);
+ /* i2c bus state byte */
+ EP8FIFOBUF[0] = get_status();
/* start: */
start_cd();
@@ -780,12 +780,10 @@ void i2c_recieve(void)
uint8_t ack = get_ack();
/* send data */
- if (data_count) { //if there is a byte reg
- for (uint8_t i = 0; i < data_count; i++) {
- send_byte(EP6FIFOBUF[i + 4]);
- /* ack(): */
- ack = get_ack();
- }
+ for (int i = 0; i < reg_byte_check; i++) {
+ send_byte(EP6FIFOBUF[i + 4]);
+ /* ack(): */
+ ack = get_ack();
}
/* repeated start: */
@@ -796,14 +794,14 @@ void i2c_recieve(void)
ack = get_ack();
/* receive data */
- for (uint8_t i = 0; i < count - 1; i++) {
+ for (int i = 1; i < count; i++) {
EP8FIFOBUF[i] = receive_byte();
/* send ack: */
send_ack();
}
- EP8FIFOBUF[count - 1] = receive_byte();
+ EP8FIFOBUF[count] = receive_byte();
/* send Nack: */
send_nack();
@@ -811,44 +809,46 @@ void i2c_recieve(void)
/* stop */
stop_cd();
- EP8BCH = 0; //EP8
+ EP8BCH = (count + 1) >> 8; //EP8
syncdelay(3);
- EP8BCL = count; //EP8
+ EP8BCL = count + 1; //EP8
EP6BCL = 0x80; //EP6
syncdelay(3);
EP6BCL = 0x80; //EP6
} else {
- uint8_t rdwr = EP6FIFOBUF[0]; //write
+ uint8_t rdwr = EP6FIFOBUF[0]; //write: 0
uint8_t count = EP6FIFOBUF[1]; //data count
uint8_t adr = EP6FIFOBUF[2]; //address
uint8_t address = get_address(adr, rdwr); //address byte (read command)
uint8_t ack_cnt = 0;
-/* start(): */
+ // i2c bus state byte
+ EP8FIFOBUF[0] = get_status();
+
+ /* start(): */
start_cd();
-/* address: */
+ /* address: */
send_byte(address); //write
-/* ack(): */
+ /* ack(): */
if (!get_ack())
ack_cnt++;
-/* send data */
- for (uint8_t i = 0; i < count; i++) {
+ /* send data */
+ for (int i = 0; i < count; i++) {
send_byte(EP6FIFOBUF[i + 3]);
-
/* get ack: */
if (!get_ack())
ack_cnt++;
}
-/* stop */
+ /* stop */
stop_cd();
- EP8FIFOBUF[0] = ack_cnt;
+ EP8FIFOBUF[1] = ack_cnt;
EP8BCH = 0; //EP8
syncdelay(3);
- EP8BCL = 1; //EP8
+ EP8BCL = 2; //EP8
EP6BCL = 0x80; //EP6
syncdelay(3);
diff --git a/src/jtag/drivers/angie/angie_firmware.bin b/src/jtag/drivers/angie/angie_firmware.bin
index 68486ef8f..6ba2babb1 100644
Binary files a/src/jtag/drivers/angie/angie_firmware.bin and b/src/jtag/drivers/angie/angie_firmware.bin differ
-----------------------------------------------------------------------
Summary of changes:
contrib/firmware/angie/c/include/i2c.h | 1 +
contrib/firmware/angie/c/src/i2c.c | 13 +++++++
contrib/firmware/angie/c/src/main.c | 2 +-
contrib/firmware/angie/c/src/usb.c | 58 +++++++++++++++---------------
src/jtag/drivers/angie/angie_firmware.bin | Bin 10216 -> 4487 bytes
5 files changed, 44 insertions(+), 30 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
