Browse Source

contrib: fix minor typos

While there, replace s/return(0)/return 0/ that causes checkpatch
to fail.

Change-Id: I5ad54cffca629475563c471114a9f77301a9e4f8
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5768
Tested-by: jenkins
jim
Antonio Borneo 2 years ago
parent
commit
29a899f3d2
17 changed files with 25 additions and 25 deletions
  1. +1
    -1
      contrib/coresight-trace.txt
  2. +1
    -1
      contrib/cross-build.sh
  3. +1
    -1
      contrib/itmdump.c
  4. +1
    -1
      contrib/loaders/flash/at91sam7x/crt.s
  5. +1
    -1
      contrib/loaders/flash/at91sam7x/dcc.c
  6. +1
    -1
      contrib/loaders/flash/at91sam7x/main.c
  7. +1
    -1
      contrib/loaders/flash/at91sam7x/ocl.h
  8. +3
    -3
      contrib/loaders/flash/cc26xx/flash.h
  9. +1
    -1
      contrib/loaders/flash/cc26xx/startup.c
  10. +2
    -2
      contrib/loaders/flash/mrvlqspi_write.S
  11. +1
    -1
      contrib/loaders/flash/msp432/driverlib.c
  12. +3
    -3
      contrib/loaders/flash/msp432/startup_msp432e4.c
  13. +3
    -3
      contrib/loaders/flash/msp432/startup_msp432p4.c
  14. +2
    -2
      contrib/loaders/flash/stm32/stm32h7x.S
  15. +1
    -1
      contrib/loaders/flash/str7x.s
  16. +1
    -1
      contrib/loaders/flash/str9x.s
  17. +1
    -1
      contrib/rpc_examples/ocd_rpc_example.py

+ 1
- 1
contrib/coresight-trace.txt View File

@@ -62,7 +62,7 @@ Clearly some of that data would be valuable for interactive debugging.
+In any case, OpenOCD is not currently GUI-oriented. Accordingly, we now
+expect any such graphics to come from postprocessing.

measurments for RTOS event timings should also be easy to collect.
measurements for RTOS event timings should also be easy to collect.
+Examples include context and message switch times, as well as times
for application interactions.
+

+ 1
- 1
contrib/cross-build.sh View File

@@ -16,7 +16,7 @@
# This script is probably more useful as a reference than as a complete build
# tool but for some configurations it may be usable as-is. It only cross-
# builds libusb-1.0 from source, but the script can be extended to build other
# prerequisities in a similar manner.
# prerequisites in a similar manner.
#
# Usage:
# export LIBUSB1_SRC=/path/to/libusb-1.0


+ 1
- 1
contrib/itmdump.c View File

@@ -325,7 +325,7 @@ static void show_timestamp(FILE *f, int c)
delayed = true;
break;
case 0xf:
label = ", packet and timetamp delayed";
label = ", packet and timestamp delayed";
delayed = true;
break;
}


+ 1
- 1
contrib/loaders/flash/at91sam7x/crt.s View File

@@ -46,7 +46,7 @@
ARM_MODE_SVC = 0x13 /* Supervisor Interrupts Mode */
ARM_MODE_ABORT = 0x17 /* Abort Processing memory Faults Mode */
ARM_MODE_UNDEF = 0x1B /* Undefined Instructions Mode */
ARM_MODE_SYS = 0x1F /* System Running in Priviledged Operating Mode */
ARM_MODE_SYS = 0x1F /* System Running in Privileged Operating Mode */
ARM_MODE_MASK = 0x1F

I_BIT = 0x80 /* disable IRQ when I bit is set */


+ 1
- 1
contrib/loaders/flash/at91sam7x/dcc.c View File

@@ -39,7 +39,7 @@ int dcc_wr(uint32 data)

do {
asm volatile ("mrc p14, 0, %0, C0, C0" : "=r" (dcc_reg) :);
/* operation controled by master, cancel operation
/* operation controlled by master, cancel operation
upon reception of data for immediate response */
if (dcc_reg&1) return -1;
} while (dcc_reg&2);


+ 1
- 1
contrib/loaders/flash/at91sam7x/main.c View File

@@ -101,5 +101,5 @@ int main (void)
}
}

return(0); /* we shall never get here, just to supress compiler warning */
return 0; /* we shall never get here, just to suppress compiler warning */
}

+ 1
- 1
contrib/loaders/flash/at91sam7x/ocl.h View File

@@ -21,7 +21,7 @@
/* command/response mask */
#define OCL_CMD_MASK 0xFFFF0000L

/* commads */
/* commands */
#define OCL_FLASH_BLOCK 0x0CFB0000L
#define OCL_ERASE_BLOCK 0x0CEB0000L
#define OCL_ERASE_ALL 0x0CEA0000L


+ 3
- 3
contrib/loaders/flash/cc26xx/flash.h View File

@@ -108,7 +108,7 @@ extern "C"

/******************************************************************************
*
* Define for the clock frequencey input to the flash module in number of MHz
* Define for the clock frequency input to the flash module in number of MHz
*
******************************************************************************/
#define FLASH_MODULE_CLK_FREQ 48
@@ -279,7 +279,7 @@ static inline uint32_t flash_check_fsm_for_ready(void)
* This function will erase the specified flash sector. The function will
* not return until the flash sector has been erased or an error condition
* occurred. If flash top sector is erased the function will program the
* the device security data bytes with default values. The device security
* device security data bytes with default values. The device security
* data located in the customer configuration area of the flash top sector,
* must have valid values at all times. These values affect the configuration
* of the device during boot.
@@ -305,7 +305,7 @@ extern uint32_t flash_sector_erase(uint32_t sector_address);
*
* This function will erase all unprotected flash sectors. The function will
* not return until the flash sectors has been erased or an error condition
* occurred. Since the flash top sector is erased the function will program the
* occurred. Since the flash top sector is erased the function will program
* the device security data bytes with default values. The device security
* data located in the customer configuration area of the flash top sector,
* must have valid values at all times. These values affect the configuration


+ 1
- 1
contrib/loaders/flash/cc26xx/startup.c View File

@@ -52,7 +52,7 @@ const uint32_t stack_pntr = (uint32_t)stack + sizeof(stack);

/******************************************************************************
*
* The following are constructs created by the linker indicating where the
* The following are constructs created by the linker indicating where
* the "bss" and "ebss" segments reside in memory.
*
******************************************************************************/


+ 2
- 2
contrib/loaders/flash/mrvlqspi_write.S View File

@@ -81,7 +81,7 @@ find_next_page_boundary:
/* If we have not reached the next page boundary after the target address, keep going */
bls find_next_page_boundary
write_enable:
/* Flush read/write fifo's */
/* Flush read/write fifos */
bl flush_fifo

/* Instruction byte 1 */
@@ -134,7 +134,7 @@ write_wait:
bl stop_tx /* Otherwise, end the command and keep going w/ the next page */
add r10, r4 /* Move up the end-of-page address by the page size*/
check_flash_busy: /* Wait for the flash to finish the previous page write */
/* Flush read/write fifo's */
/* Flush read/write fifos */
bl flush_fifo
/* Instruction byte 1 */
movs r8, #0x1


+ 1
- 1
contrib/loaders/flash/msp432/driverlib.c View File

@@ -367,7 +367,7 @@ bool pcm_shutdown_device(uint32_t shutdown_mode)
uint32_t shutdown_mode_bits = (shutdown_mode == PCM_LPM45) ?
PCM_CTL0_LPMR_12 : PCM_CTL0_LPMR_10;

/* If a power transition is occuring, return false */
/* If a power transition is occurring, return false */
if (BITBAND_PERI(PCM->CTL1, PCM_CTL1_PMR_BUSY_OFS))
return false;



+ 3
- 3
contrib/loaders/flash/msp432/startup_msp432e4.c View File

@@ -71,9 +71,9 @@ void (* const intr_vectors[])(void) __attribute__((section(".intvecs"))) = {
};

/*
* The following are constructs created by the linker, indicating where the
* the "data" and "bss" segments reside in memory. The initializers for the
* for the "data" segment resides immediately following the "text" segment.
* The following are constructs created by the linker, indicating where
* the "data" and "bss" segments reside in memory. The initializers for
* the "data" segment resides immediately following the "text" segment.
*/
extern uint32_t __bss_start__;
extern uint32_t __bss_end__;


+ 3
- 3
contrib/loaders/flash/msp432/startup_msp432p4.c View File

@@ -71,9 +71,9 @@ void (* const intr_vectors[])(void) __attribute__((section(".intvecs"))) = {
};

/*
* The following are constructs created by the linker, indicating where the
* the "data" and "bss" segments reside in memory. The initializers for the
* for the "data" segment resides immediately following the "text" segment.
* The following are constructs created by the linker, indicating where
* the "data" and "bss" segments reside in memory. The initializers for
* the "data" segment resides immediately following the "text" segment.
*/
extern uint32_t __bss_start__;
extern uint32_t __bss_end__;


+ 2
- 2
contrib/loaders/flash/stm32/stm32h7x.S View File

@@ -25,7 +25,7 @@
* Code limitations:
* The workarea must have size multiple of 4 bytes, since R/W
* operations are all at 32 bits.
* The workarea must be big enough to contain rp, wp and data, thus the minumum
* The workarea must be big enough to contain rp, wp and data, thus the minimum
* workarea size is: min_wa_size = sizeof(rp, wp, data) = 4 + 4 + sizeof(data).
* - for 0x450 devices: sizeof(data) = 32 bytes, thus min_wa_size = 40 bytes.
* - for 0x480 devices: sizeof(data) = 16 bytes, thus min_wa_size = 24 bytes.
@@ -78,7 +78,7 @@ wait_fifo:
str r7, [r5, #STM32_FLASH_CR_OFFSET]

mov r8, #4
udiv r8, r4, r8 /* number of words is size of write word devided by 4*/
udiv r8, r4, r8 /* number of words is size of write word divided by 4*/
write_flash:
dsb
ldr r7, [r6], #0x04 /* read one word from src, increment ptr */


+ 1
- 1
contrib/loaders/flash/str7x.s View File

@@ -51,7 +51,7 @@ busy:
tsteq r4, #0x100 /* write protection set */
bne exit
add r1, r1, #0x8 /* next 8 bytes */
subs r3, r3, #1 /* decremment dword count */
subs r3, r3, #1 /* decrement dword count */
bne write
exit:
b exit


+ 1
- 1
contrib/loaders/flash/str9x.s View File

@@ -48,7 +48,7 @@ busy:
strh r5, [r4, #0]
tst r3, #0x12
bne exit
subs r2, r2, #1 /* decremment word count */
subs r2, r2, #1 /* decrement word count */
bne write
exit:
bkpt #0


+ 1
- 1
contrib/rpc_examples/ocd_rpc_example.py View File

@@ -125,7 +125,7 @@ if __name__ == "__main__":
show(ocd.send("capture { echo \"echo says hi!\" }")[:-1])
show(ocd.send("capture \"halt\"")[:-1])

# Read the first few words at the RAM region (put starting adress of RAM
# Read the first few words at the RAM region (put starting address of RAM
# region into 'addr')
addr = 0x10000000



Loading…
Cancel
Save