]> git.sur5r.net Git - openocd/log
openocd
15 years agoBrian Findlay <findlaybrian@gmail.com> Board support for mini2440 (friendlyARM) samsu...
oharboe [Tue, 18 Aug 2009 17:57:19 +0000 (17:57 +0000)]
Brian Findlay <findlaybrian@gmail.com> Board support for mini2440 (friendlyARM) samsung s3c2440 based board

git-svn-id: svn://svn.berlios.de/openocd/trunk@2593 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- add cfg file for Amontec JTAGKey2 jtag interface
ntfreak [Tue, 18 Aug 2009 16:46:48 +0000 (16:46 +0000)]
- add cfg file for Amontec JTAGKey2 jtag interface

git-svn-id: svn://svn.berlios.de/openocd/trunk@2592 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoJonas Horberg [jhorberg@sauer-danfoss.com]
ntfreak [Tue, 18 Aug 2009 14:41:58 +0000 (14:41 +0000)]
Jonas Horberg [jhorberg@sauer-danfoss.com]
https://lists.berlios.de/pipermail/openocd-development/2009-August/009939.html

1. It can only be built with the FTD2XX driver. libftdi supports FT2232H/FT4232H
since version 0.16

2. A speed value of 0 is used as a RTCK request indicator. This clashes with the
valid clock division value 0 that provide the highest fixed clock frequency.

3. The ft2232_speed_div function return the maximum selectable frequency (30MHz)
when RTCK is activated. It should return 0.

4. The ft2232_khz function return ERROR_OK when RTCK is requested even for
devices lacking RTCK support. It should return ERROR_FAIL so the upper driver layers
can detect this and try to fallback to a fixed frequency.

5. FT2232H/FT4232H have a backward compatibility function that divide the clock
by 5 to get the same frequency range as FT2232D. There is no code that disable
this functionality. I can not find anything about if this is enabled or disabled by default.
I think it is safest to actively disable it.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2591 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoJonas Horberg [jhorberg@sauer-danfoss.com]
ntfreak [Tue, 18 Aug 2009 12:14:01 +0000 (12:14 +0000)]
Jonas Horberg [jhorberg@sauer-danfoss.com]
Change jtag_rclk behaviour so it can be called before the interface init function

git-svn-id: svn://svn.berlios.de/openocd/trunk@2590 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Cleanup the Stellaris target configs:
oharboe [Tue, 18 Aug 2009 10:27:24 +0000 (10:27 +0000)]
David Brownell <david-b@pacbell.net> Cleanup the Stellaris target configs:

 - remove endianness options; these chips hard-wire "little"
 - $_TARGETNAME updates:
    * don't pass $_TARGETNAME where a TAP label is required
    * flash config uses $_TARGETNAME (it might not be target #0)
    * simplify one $_TARGETNAME construction
 - update work area setup:
    * remove VM spec; these chips have no VM!
    * fix some wrong sizes (0x4000 == 16K, not 4K)
    * simplify: take defaults
 - comment fixups

git-svn-id: svn://svn.berlios.de/openocd/trunk@2589 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Add "cortex_m3 vector_catch" command and docs...
oharboe [Tue, 18 Aug 2009 10:25:28 +0000 (10:25 +0000)]
David Brownell <david-b@pacbell.net> Add "cortex_m3 vector_catch" command and docs.  One minor
issue with this is that the core debug support uses this
mechanism, then trashes its state over reset.  Users can
Work around that (for now) by re-assigning the desired
config after reset.

Also fixes "target halted due to target-not-halted" goof.
When we can't describe the reason using OpenOCD's limited
vocabulary, say "reason undefined" instead of saying it's
not halted.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2588 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Clean up ARM7/ARM9 EmbeddedICE register handling...
oharboe [Tue, 18 Aug 2009 10:22:44 +0000 (10:22 +0000)]
David Brownell <david-b@pacbell.net> Clean up ARM7/ARM9 EmbeddedICE register handling ... don't use parallel
arrays (error prone) or assume all registers are 32-bits wide (they can
have fewer bits); don't use spaces in register names, so they can be
passed more easily to the "reg" command.

Minor updates for ARM9 vector_catch support:  it's an 8-bit value.  This
seems to help this core's vector_catch command work a bit better; but its
behavior wih the register cache is still goofy.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2587 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Several of the ARMv7M registers are 8 bits or...
oharboe [Tue, 18 Aug 2009 10:20:25 +0000 (10:20 +0000)]
David Brownell <david-b@pacbell.net> Several of the ARMv7M registers are 8 bits or less; don't
display them as 32 bits unless that's their true size.
(Removes some confusion.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2586 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoPiotr Ziecik <kosmo@semihalf.com> Due to errors in chipselect management in davinci_n...
oharboe [Tue, 18 Aug 2009 10:18:18 +0000 (10:18 +0000)]
Piotr Ziecik <kosmo@semihalf.com> Due to errors in chipselect management in davinci_nand driver
OpenOCD was able to access only to chips attached to first EMIF
chipselect. This patch fixes chipselect management code and allows
OpenOCD to access to NAND devices attached to any EMIF CS line.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2585 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoXiaofan Chen <xiaofanc@gmail.com> Split LM3S811 config file into target file and...
oharboe [Sun, 16 Aug 2009 12:08:35 +0000 (12:08 +0000)]
Xiaofan Chen <xiaofanc@gmail.com> Split LM3S811 config file into target file and board file

git-svn-id: svn://svn.berlios.de/openocd/trunk@2584 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agomichal smulski <michal.smulski@ooma.com> arm11 target config files
oharboe [Sun, 16 Aug 2009 11:58:40 +0000 (11:58 +0000)]
michal smulski <michal.smulski@ooma.com> arm11 target config files

git-svn-id: svn://svn.berlios.de/openocd/trunk@2583 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoXiaofan Chen <xiaofanc@gmail.com> Add config file for TI-Luminary LM3S1968 chip and...
oharboe [Sun, 16 Aug 2009 11:54:56 +0000 (11:54 +0000)]
Xiaofan Chen <xiaofanc@gmail.com> Add config file for TI-Luminary LM3S1968 chip and EK-LM3S1968 board

git-svn-id: svn://svn.berlios.de/openocd/trunk@2582 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoFerdinand Postema <ferdinand@postema.eu> cygwin 32 bit warning
oharboe [Sun, 16 Aug 2009 11:52:50 +0000 (11:52 +0000)]
Ferdinand Postema <ferdinand@postema.eu> cygwin 32 bit warning

git-svn-id: svn://svn.berlios.de/openocd/trunk@2581 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoadded note w/reference to discussion on whether or not arm11 code is broken or not.
oharboe [Sun, 16 Aug 2009 11:49:21 +0000 (11:49 +0000)]
added note w/reference to discussion on whether or not arm11 code is broken or not.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2580 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAudrius Urmanavičius [didele.deze@gmail.com]:
ntfreak [Thu, 13 Aug 2009 13:54:53 +0000 (13:54 +0000)]
Audrius Urmanavičius [didele.deze@gmail.com]:
Add flash programming support for NXP LPC1700 cortex_m3 based family

git-svn-id: svn://svn.berlios.de/openocd/trunk@2579 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Fri, 7 Aug 2009 09:37:59 +0000 (09:37 +0000)]
David Brownell <david-b@pacbell.net>:
Warn about anyone using "jtag_speed" commands; that command is obsolete, and will someday be removed.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2578 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Fri, 7 Aug 2009 09:29:41 +0000 (09:29 +0000)]
David Brownell <david-b@pacbell.net>:
Better explanation for the TAP "-ircapture" parameter.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2577 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoFerdinand Postema [ferdinand@postema.eu]
ntfreak [Fri, 7 Aug 2009 09:19:06 +0000 (09:19 +0000)]
Ferdinand Postema [ferdinand@postema.eu]
- fix vector catch issues with certain ARM9 cores - AT91SAM9260 and STR9

git-svn-id: svn://svn.berlios.de/openocd/trunk@2576 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- fix segfault introduced during cortex reg cleanup
ntfreak [Fri, 7 Aug 2009 09:09:06 +0000 (09:09 +0000)]
- fix segfault introduced during cortex reg cleanup

git-svn-id: svn://svn.berlios.de/openocd/trunk@2575 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoGary Carlson [gcarlson@carlson-minot.com]:
ntfreak [Thu, 6 Aug 2009 23:34:34 +0000 (23:34 +0000)]
Gary Carlson [gcarlson@carlson-minot.com]:
- revert patch from rev1507 as it was causing reset issues with arm9 cores

git-svn-id: svn://svn.berlios.de/openocd/trunk@2574 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- Bring all the ftdi names inline in the cfg scripts. scripts will now work for eithe...
ntfreak [Thu, 6 Aug 2009 21:44:18 +0000 (21:44 +0000)]
- Bring all the ftdi names inline in the cfg scripts. scripts will now work for either ftd2xx or libftdi drivers.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2573 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agomichal smulski <michal.smulski@ooma.com>:
zwelch [Thu, 6 Aug 2009 19:52:56 +0000 (19:52 +0000)]
michal smulski <michal.smulski@ooma.com>:

Fix ARM11 half-word bulk memory read and write.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2572 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- add configure error if building parport interface under cygwin and sys/io.h missing
ntfreak [Fri, 31 Jul 2009 08:52:03 +0000 (08:52 +0000)]
- add configure error if building parport interface under cygwin and sys/io.h missing

git-svn-id: svn://svn.berlios.de/openocd/trunk@2571 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoFix NPE in GDB_EVENT_END as logforwarding was not disabled early enough
oharboe [Mon, 27 Jul 2009 18:56:43 +0000 (18:56 +0000)]
Fix NPE in GDB_EVENT_END as logforwarding was not disabled early enough

git-svn-id: svn://svn.berlios.de/openocd/trunk@2570 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoadd "dummy" interface trick to the BUGS reporting suggestions
oharboe [Mon, 27 Jul 2009 14:46:49 +0000 (14:46 +0000)]
add "dummy" interface trick to the BUGS reporting suggestions

git-svn-id: svn://svn.berlios.de/openocd/trunk@2569 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> More testcase work:
oharboe [Sun, 26 Jul 2009 20:00:39 +0000 (20:00 +0000)]
David Brownell <david-b@pacbell.net> More testcase work:

       A5.3.11 Data processing (shifted register)

The usual kinds of problems; the most noteworthy were that
the "S"et flags bit was mis-handled in these instructions.
---
This is the last patch from a quickie set of tests covering all
encodings of the instructions with 32-bit opcodes.  There may
be some corner cases left, plus the instructions that aren't
yet handled, but the Thumb2 disassembler is no longer just
"lightly" tested with GCC output ... the new code paths have
mostly been verified.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2568 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoMore instruction decoding fixes:
oharboe [Sun, 26 Jul 2009 19:59:33 +0000 (19:59 +0000)]
More instruction decoding fixes:

       A5.3.5 Load/store multiple
       A5.3.7 Load word

There was a longstanding bug in Thumb-1 LDM; the rest of the LDM/STM
fixes are just using width specs to match UAL syntax, except for two
opcode name typos.  Load word had two bitmask goofs.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2567 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> More fixes from test cases:
oharboe [Sun, 26 Jul 2009 19:58:25 +0000 (19:58 +0000)]
David Brownell <david-b@pacbell.net> More fixes from test cases:

       A5.3.8 Load halfword, unallocated memory hints

It's mostly the usual sort of bitmasking goofage and getting the
width specs right.  In one case an older x86 GCC generated bad code
unless I structred a conditional differently (sigh).

git-svn-id: svn://svn.berlios.de/openocd/trunk@2566 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> More instruction decoding fixes:
oharboe [Sun, 26 Jul 2009 19:56:58 +0000 (19:56 +0000)]
David Brownell <david-b@pacbell.net> More instruction decoding fixes:

       A5.3.5 Load/store multiple
       A5.3.7 Load word

There was a longstanding bug in Thumb-1 LDM; the rest of the LDM/STM
fixes are just using width specs to match UAL syntax, except for two
opcode name typos.  Load word had two bitmask goofs.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2565 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> More instruction decoding fixes based on test...
oharboe [Fri, 24 Jul 2009 16:49:44 +0000 (16:49 +0000)]
David Brownell <david-b@pacbell.net> More instruction decoding fixes based on test cases, covering
ARMv7-M arch manual:

 A5.3.1 Data processing (modified immediate)
 A5.3.3 Data processing (plain binary immediate)
 A5.3.4 Branches and miscellaneous control

and other (immediate) encodings referenced there.  Several of
these just tweak the new syntax ("Unified" ARM/Thumb: UAL) but
there were a few bugs too.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2564 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Bugfix some instruction decoding ... I've crafte...
oharboe [Fri, 24 Jul 2009 16:48:12 +0000 (16:48 +0000)]
David Brownell <david-b@pacbell.net> Bugfix some instruction decoding ... I've crafted asm files
with testcases covering several new encodings in these sections
of the ARMv7-M arch manual:

 A5.3.12 Data processing (register)
 A5.3.13 Miscellaneous operations
 A5.3.14 Multiply, and multiply accumulate
 A5.3.15 Long multiply, long multiply accumulate, and divide

The issues were mostly in '12 and '13; some new related 16-bit
opcodes had issues too.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2563 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAndreas Fritiofson <andreas.fritiofson@gmail.com> I noticed there are a few checks...
oharboe [Fri, 24 Jul 2009 05:42:45 +0000 (05:42 +0000)]
Andreas Fritiofson <andreas.fritiofson@gmail.com> I noticed there are a few checks for (rt == 0xf) even though that case
is handled with an early return at the top of the function.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2562 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> thumb2 disassembly for Load halfword
oharboe [Thu, 23 Jul 2009 15:35:16 +0000 (15:35 +0000)]
David Brownell <david-b@pacbell.net>  thumb2 disassembly for Load halfword

git-svn-id: svn://svn.berlios.de/openocd/trunk@2561 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> thumb2 disassembly for Load byte, memory hints
oharboe [Thu, 23 Jul 2009 15:34:03 +0000 (15:34 +0000)]
David Brownell <david-b@pacbell.net> thumb2 disassembly for Load byte, memory hints

git-svn-id: svn://svn.berlios.de/openocd/trunk@2560 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoFerdinand Postema <ferdinand@postema.eu> fix cygwin warnings
oharboe [Thu, 23 Jul 2009 07:04:21 +0000 (07:04 +0000)]
Ferdinand Postema <ferdinand@postema.eu> fix cygwin warnings

git-svn-id: svn://svn.berlios.de/openocd/trunk@2559 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> fix warnings
oharboe [Thu, 23 Jul 2009 07:02:43 +0000 (07:02 +0000)]
David Brownell <david-b@pacbell.net> fix warnings

git-svn-id: svn://svn.berlios.de/openocd/trunk@2558 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoJonathan Cameron <jic23@cam.ac.uk> fix regression from 1836 when the reset_config...
oharboe [Wed, 22 Jul 2009 19:35:23 +0000 (19:35 +0000)]
Jonathan Cameron <jic23@cam.ac.uk> fix regression from 1836 when the reset_config command was removed from pxa270.cfg

git-svn-id: svn://svn.berlios.de/openocd/trunk@2557 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoStefano Voulaz <s.voulaz@projecktstudio.com> first cut samsung_s3c2450
oharboe [Wed, 22 Jul 2009 14:25:56 +0000 (14:25 +0000)]
Stefano Voulaz <s.voulaz@projecktstudio.com> first cut samsung_s3c2450

git-svn-id: svn://svn.berlios.de/openocd/trunk@2556 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Tue, 21 Jul 2009 20:19:02 +0000 (20:19 +0000)]
David Brownell <david-b@pacbell.net>:

Dump SP on poll, and show whether it's MSP or PSP.

Thread mode can use either stack pointer, so this is
part of the state that's not yet displayed.

Shrink some lines.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2555 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Tue, 21 Jul 2009 20:15:11 +0000 (20:15 +0000)]
David Brownell <david-b@pacbell.net>:

Clean up treatment of registers in ARMv7-M and Cortex-M3.

 - At the arch level:
    * Just list registers and names; don't impose core-specific
      policy about how they are accessed.
    * Each register has a symbol.
    * Remove the register mode field (irrelevant to debugger)

 - At the core/implementation level:
    * Just map the registers to their relevant access methods;
      don't require the arch level to say how that should work
      (cores other than Cortex-M3 could do it differently).
    * Don't use undefined bits from register 20.
    * Use register IDs that are part of the ARMv7-M interface.

In short, there's now a real distinction between the arch
and core layers.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2554 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Tue, 21 Jul 2009 20:05:05 +0000 (20:05 +0000)]
David Brownell <david-b@pacbell.net>:

Minor updates to the Thumb2 disassembly:

 - Bugfixes:
    * Distinguish branch from misc via "!=" not "=="
    * MRS register shift is 8 bits (vs MSR being 16)
 - Format tweaks:
    * CPS needed tab (not space)
    * add commma before some shifts
    * add space after comma in LDM/STM
    * use ".W" width spec on various instructions

git-svn-id: svn://svn.berlios.de/openocd/trunk@2553 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
ntfreak [Tue, 21 Jul 2009 20:03:17 +0000 (20:03 +0000)]
David Brownell <david-b@pacbell.net>:

Revert parts of the previous ARMv7-M register patch.
It turns out that part of the issue is a documentation
problem for the Cortex-M3 r1 parts. So for the rest,
simpler fixes are possible (in followup patch).

git-svn-id: svn://svn.berlios.de/openocd/trunk@2552 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- fix issue with reading device id, bug appeared when flash_address code was added
ntfreak [Mon, 20 Jul 2009 07:03:11 +0000 (07:03 +0000)]
- fix issue with reading device id, bug appeared when flash_address code was added
- fix issue when multiple flash chips are connected, eg. x16 x 2 on 32bit mcu bus

git-svn-id: svn://svn.berlios.de/openocd/trunk@2551 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoaduc flash problems have been resolved
oharboe [Sun, 19 Jul 2009 19:31:54 +0000 (19:31 +0000)]
aduc flash problems have been resolved

git-svn-id: svn://svn.berlios.de/openocd/trunk@2550 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAndreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes
oharboe [Fri, 17 Jul 2009 19:54:25 +0000 (19:54 +0000)]
Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

git-svn-id: svn://svn.berlios.de/openocd/trunk@2549 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoadded item to come up with slick new 32 bit jtag_add_xxx() API
oharboe [Thu, 16 Jul 2009 10:44:42 +0000 (10:44 +0000)]
added item to come up with slick new 32 bit jtag_add_xxx() API

git-svn-id: svn://svn.berlios.de/openocd/trunk@2548 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agomicroscopic whitespace cleanup
oharboe [Thu, 16 Jul 2009 10:43:15 +0000 (10:43 +0000)]
microscopic whitespace cleanup

git-svn-id: svn://svn.berlios.de/openocd/trunk@2547 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agomicroscopic white space fixes
oharboe [Thu, 16 Jul 2009 10:30:50 +0000 (10:30 +0000)]
microscopic white space fixes

git-svn-id: svn://svn.berlios.de/openocd/trunk@2546 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- disable using parport ppdev under win32 hosts
ntfreak [Thu, 16 Jul 2009 10:03:33 +0000 (10:03 +0000)]
- disable using parport ppdev under win32 hosts

git-svn-id: svn://svn.berlios.de/openocd/trunk@2545 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoMagnus Lundin <lundin@mlu.mine.nu>, Oyvind Harboe <oyvind.harboe@zylin.com>, David...
zwelch [Thu, 16 Jul 2009 00:08:36 +0000 (00:08 +0000)]
Magnus Lundin <lundin@mlu.mine.nu>, Oyvind Harboe <oyvind.harboe@zylin.com>, David Brownell <david-b@pacbell.net>:

Move the dap command handler implementations to arm_adi_v5.c,
leaving just thin wrappers in armv7m.c.  There should be no
change in functionality here.  (From Magnus.)

Minor style cleanup:  whitespace, line length, etc.  Update spec
references to use docs which are currently available.  (From Dave.)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2544 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoMagnus Lundin <lundin@mlu.mine.nu>, Oyvind Harboe <oyvind.harboe@zylin.com>, David...
zwelch [Thu, 16 Jul 2009 00:08:21 +0000 (00:08 +0000)]
Magnus Lundin <lundin@mlu.mine.nu>, Oyvind Harboe <oyvind.harboe@zylin.com>, David Brownell <david-b@pacbell.net>:

Some cleanup of the ARMv7-M support:

 - Reference the relevant ARMv7-M ARM doc (DDI 0405C to non-Vendors), and
   update the Cortex-M3 doc refs (DDI 0337C is no longer available).

 - Those registers aren't actually general, and some are incorrect (per all
   public docs anyway).  Update comments and code accordingly.

     * What the Core Debug facility exposes is *implementation-specific*
       not architectural.  These values aren't fully portable.  They match
       Cortex-M3 ... so no current implementation will make trouble, but
       the next v7m implementation might.

     * Four of the registers are actually not exposed that way.  Before
       Cortex-M3 r2p0 they are read/written through MRS/MSR instructions.
       In that newest silicon, they are four bytes in one register, not
       four separate registers.

 - Update the CM3 code to report when that one register is available,
   and not try to access it when it isn't.  Also declare the register
   numbers that an eventual MRS/MSR solution will need to be using.

 - Stop line wrapping the exception labels.

So for parts before r2p0 OpenOCD behavior is effectively unchanged, and
still buggy; but for those newer parts a few things might now be correct.

Most current Cortex-M3 parts use r1p1 (or earlier); this seems to include
most LM3S parts and all STM32 parts.  Parts using r2p0 are available, and
include fourth generation LM3S parts ("Tempest") plus AT91SAM3 and LPC17xx
parts which are now sampling.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2543 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:49:12 +0000 (23:49 +0000)]
David Brownell <david-b@pacbell.net>:

More 32-bit Thumb2 instruction decoding:

A5.3.7 Load word

git-svn-id: svn://svn.berlios.de/openocd/trunk@2542 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:49:05 +0000 (23:49 +0000)]
David Brownell <david-b@pacbell.net>:

More 32-bit Thumb2 instruction decoding:

A5.3.12 Data processing (register)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2541 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:49:00 +0000 (23:49 +0000)]
David Brownell <david-b@pacbell.net>:

More 32-bit instruction decoding:

A5.3.11 Data processing (shifted register)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2540 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:54 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

More instructions decoded:

A5.3.5 Load/store multiple

The preferred PUSH/POP syntax is shown when appropriate.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2539 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:43 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

More instructions decoded:

A5.3.14 Multiply, and multiply accumulate
A5.3.15 Long multiply, long multiply accumulate, divide

The EABI requires *adjacent* register pairs, but the long multiply
ops can use any pair of registers; interesting.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2538 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:37 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

More Thumb2 32-bit opcode support:

 A5.3.10 Store single data item

Byte, word, halfword.  Offset, pre-index, post-index.  And
a "make like you're unprivileged" option when using small
immediate offsets.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2537 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:32 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

Print old-style Thumb NOP instructions as such.  (GCC uses "mov r8, r8"
instead of the architected NOP which is new in Thumb2.)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2536 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:27 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

Make disassembly of the Thumb load-literal instruction show the
address of the literal being loaded (so users can avoid doing
that math themselves).  Add and use an Align(PC,4) utility.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2535 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:21 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

Make the Thumb2 disassembler handle more 32-bit instructions:

  A5.3.3 Data processing (plain binary immediate)

These use mostly twelve bit literals, but there are also bitfield
and saturated add primitives.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2534 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:16 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

Make the Thumb2 disassembler handle more 32-bit instructions:

  A5.3.1 Data processing (modified immediate)

My small sample shows GCC likes to use many of these instructions.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2533 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:48:11 +0000 (23:48 +0000)]
David Brownell <david-b@pacbell.net>:

Make the Thumb2 disassembler handle a bunch of 32-bit instructions:

  A5.3.4 Branches and miscellaneous control

Note that this shifts some responsabililty out of helper functions,
making the code and layout simpler for 32-bit decoders:  they only
need to know how to format the instruction and its parameters.

Also, technical note:  with this patch, Thumb1 decoders could now
call the Thumb2 decoder if they wanted to get nicer treatment of
the exiting 32-bit B/BLX instructions.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2532 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:39:48 +0000 (23:39 +0000)]
David Brownell <david-b@pacbell.net>:

Change layout of Thumb disassembly to work better with Thumb2:

 - Move opcode to the left, allowing space for four hex bytes:
    * after address, two spaces not one tab (taking 6 spaces)
    * after 2-byte opcode, four spaces before tab
 - Also, after opcode mnemonic use a tab not a space, to make
   operands line up

Sample output (after some patches decoding a few 32-bit instructions):

0x00003e5a  0xf4423200 ORR r2, r2, #131072 ; 0x20000
0x00003e5e  0x601a     STR  r2, [r3, #0x0]
0x00003e60  0x2800     CMP r0, #0x00
0x00003e62  0xd1f3     BNE 0x00003e4c
0x00003e64  0xf008fa38 BL 0x0000c2d8

The affected lines of code now wrap at sane margins too.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2531 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net>:
zwelch [Wed, 15 Jul 2009 23:39:37 +0000 (23:39 +0000)]
David Brownell <david-b@pacbell.net>:

Initial support for disassembling Thumb2 code.  This works only for
Cortex-M3 cores so far.  Eventually other cores will also need Thumb2
support ... but they don't yet support any kind of disassembly.

 - Update the 16-bit Thumb decoder:

     * Understand CPS, REV*, SETEND, {U,S}XT{B,H} opcodes added
       by ARMv6.  (It already seems to treat CPY as MOV.)

     * Understand CB, CBNZ, WFI, IT, and other opcodes added by
       in Thumb2.

 - A new Thumb2 instruction decode routine is provided.

     * This has a different signature:  pass the target, not the
       instruction, so it can fetch a second halfword when needed.
       The instruction size is likewise returned to the caller.

     * 32-bit instructions are recognized but not yet decoded.

 - Start using the current "UAL" syntax in some cases.  "SWI" is
   renamed as "SVC"; "LDMIA" as "LDM"; "STMIA" as "STM".

 - Define a new "cortex_m3 disassemble addr count" command to give
   access to this disassembly.

Sanity checked against "objdump -d" output; a bunch of the new
instructions checked out fine.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2530 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoprint errno when parport fails to open.
oharboe [Wed, 15 Jul 2009 12:30:06 +0000 (12:30 +0000)]
print errno when parport fails to open.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2529 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoretire Eclipse settings, charset will be set elsewhere.
oharboe [Wed, 15 Jul 2009 06:43:28 +0000 (06:43 +0000)]
retire Eclipse settings, charset will be set elsewhere.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2528 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoEclipse settings include charset.
oharboe [Tue, 14 Jul 2009 18:30:00 +0000 (18:30 +0000)]
Eclipse settings include charset.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2527 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> mention udev, and correct D2XX speed mentions
oharboe [Tue, 14 Jul 2009 18:24:59 +0000 (18:24 +0000)]
David Brownell <david-b@pacbell.net> mention udev, and correct D2XX speed mentions

git-svn-id: svn://svn.berlios.de/openocd/trunk@2526 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago- fix small typo in documentation
ntfreak [Tue, 14 Jul 2009 11:57:59 +0000 (11:57 +0000)]
- fix small typo in documentation

git-svn-id: svn://svn.berlios.de/openocd/trunk@2525 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years ago1.54 snapshot
oharboe [Tue, 14 Jul 2009 10:38:26 +0000 (10:38 +0000)]
1.54 snapshot

git-svn-id: svn://svn.berlios.de/openocd/trunk@2523 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoArchive released NEWS file: NEWS -> NEWS-0.2.0
zwelch [Tue, 14 Jul 2009 09:02:00 +0000 (09:02 +0000)]
Archive released NEWS file: NEWS -> NEWS-0.2.0
Create new NEWS file from release script template.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2522 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoBump minor version and add tag:
zwelch [Tue, 14 Jul 2009 08:54:36 +0000 (08:54 +0000)]
Bump minor version and add tag:
Bump minor package version number: 0.2.0 -> 0.3.0
Add '-in-development' version tag: 0.3.0 -> 0.3.0-in-development

git-svn-id: svn://svn.berlios.de/openocd/trunk@2521 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoRemove '-in-development' version tag: 0.2.0-in-development -> 0.2.0 v0.2.0
zwelch [Tue, 14 Jul 2009 08:53:40 +0000 (08:53 +0000)]
Remove '-in-development' version tag: 0.2.0-in-development -> 0.2.0

git-svn-id: svn://svn.berlios.de/openocd/trunk@2517 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoImprove the release script before 0.2.0:
zwelch [Tue, 14 Jul 2009 08:52:28 +0000 (08:52 +0000)]
Improve the release script before 0.2.0:
1) Only archive NEWS file on major and minor relesae, not bug-fixes.
2) Switch back to correct development branch during final release step.
3) Add do_svn_switch helper to ensure package variables are reloaded.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2516 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoSplit Windows README instructions into new file, with a few fixes.
zwelch [Tue, 14 Jul 2009 07:35:29 +0000 (07:35 +0000)]
Split Windows README instructions into new file, with a few fixes.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2515 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoMake the parport-ppdev option enabled by default. This may require
zwelch [Tue, 14 Jul 2009 06:39:55 +0000 (06:39 +0000)]
Make the parport-ppdev option enabled by default.  This may require
giving --disable-parport-ppdev to configure on some platform(s).

git-svn-id: svn://svn.berlios.de/openocd/trunk@2514 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoGary Carlson <gcarlson@carlson-minot.com>
ntfreak [Mon, 13 Jul 2009 06:36:51 +0000 (06:36 +0000)]
Gary Carlson <gcarlson@carlson-minot.com>
Spencer Oliver <spen@spen-soft.co.uk>

- fix jlink win32/linux/darwin startup issues
- see https://lists.berlios.de/pipermail/openocd-development/2009-July/009438.html

git-svn-id: svn://svn.berlios.de/openocd/trunk@2513 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoXiaofan Chen <xiaofanc@gmail.com> document my experiment
oharboe [Sun, 12 Jul 2009 19:32:22 +0000 (19:32 +0000)]
Xiaofan Chen <xiaofanc@gmail.com> document my experiment
with MinGW cross build.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2512 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoXiaofan Chen <xiaofanc@gmail.com> retire obsolete patch. OpenOCD only supports 0...
oharboe [Sun, 12 Jul 2009 19:31:13 +0000 (19:31 +0000)]
Xiaofan Chen <xiaofanc@gmail.com> retire obsolete patch. OpenOCD only supports 0.14 and newer and the patch was for 0.14.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2511 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoMagnus Lundin Thc cortex_m3_poll function does not identify that a target is running...
oharboe [Sun, 12 Jul 2009 19:29:08 +0000 (19:29 +0000)]
Magnus Lundin  Thc cortex_m3_poll function does not identify that a target is running unless we transition from RESET.

This patch correctly identifies a running target.

Patch made a tad more palatable by David Brownell <david-b@pacbell.net>

git-svn-id: svn://svn.berlios.de/openocd/trunk@2510 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoPeter Denison <openwrt@marshadder.org> workaround for broken USBprog w/short tms...
oharboe [Sun, 12 Jul 2009 14:11:43 +0000 (14:11 +0000)]
Peter Denison <openwrt@marshadder.org> workaround for broken USBprog w/short tms sequences

git-svn-id: svn://svn.berlios.de/openocd/trunk@2509 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> Mention how parallel clock voting implementation...
oharboe [Sun, 12 Jul 2009 14:08:16 +0000 (14:08 +0000)]
David Brownell <david-b@pacbell.net> Mention how parallel clock voting implementations of RTCK work,
and reference TI's free VHDL code.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2508 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoSimple warning fix
duane [Sat, 11 Jul 2009 02:01:22 +0000 (02:01 +0000)]
Simple warning fix

git-svn-id: svn://svn.berlios.de/openocd/trunk@2507 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agowrote up workaround for xscale/debug_handler.bin bug
oharboe [Fri, 10 Jul 2009 08:47:10 +0000 (08:47 +0000)]
wrote up workaround for xscale/debug_handler.bin bug

git-svn-id: svn://svn.berlios.de/openocd/trunk@2506 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agonoted XScale (or USBProg) problem
oharboe [Fri, 10 Jul 2009 08:46:12 +0000 (08:46 +0000)]
noted XScale (or USBProg) problem

git-svn-id: svn://svn.berlios.de/openocd/trunk@2505 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoDavid Brownell <david-b@pacbell.net> split EK board support out
oharboe [Fri, 10 Jul 2009 07:21:12 +0000 (07:21 +0000)]
David Brownell <david-b@pacbell.net> split EK board support out
from the target CPU support .

git-svn-id: svn://svn.berlios.de/openocd/trunk@2504 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAdd style rule to avoid combining assignment and logical tests.
zwelch [Wed, 8 Jul 2009 22:26:42 +0000 (22:26 +0000)]
Add style rule to avoid combining assignment and logical tests.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2503 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAdd section to provide some documentation for cross-compiling.
zwelch [Wed, 8 Jul 2009 22:26:36 +0000 (22:26 +0000)]
Add section to provide some documentation for cross-compiling.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2502 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAdd microscopic style guide at the end of the PATCH primer.
zwelch [Wed, 8 Jul 2009 22:26:29 +0000 (22:26 +0000)]
Add microscopic style guide at the end of the PATCH primer.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2501 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoAdd comments to top-level files to "excuse" their Doxygen markup.
zwelch [Wed, 8 Jul 2009 22:26:20 +0000 (22:26 +0000)]
Add comments to top-level files to "excuse" their Doxygen markup.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2500 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoFix SEGFAULTs and broken error handling for flash programming w/working area
oharboe [Wed, 8 Jul 2009 18:29:03 +0000 (18:29 +0000)]
Fix SEGFAULTs and broken error handling for flash programming w/working area

git-svn-id: svn://svn.berlios.de/openocd/trunk@2499 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agofix formatting of xscale bug entry(learning every day)
oharboe [Wed, 8 Jul 2009 10:38:50 +0000 (10:38 +0000)]
fix formatting of xscale bug entry(learning every day)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2498 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoXscale installation regression entered
oharboe [Wed, 8 Jul 2009 10:25:39 +0000 (10:25 +0000)]
Xscale installation regression entered

git-svn-id: svn://svn.berlios.de/openocd/trunk@2497 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agotypo in comment
oharboe [Wed, 8 Jul 2009 10:25:23 +0000 (10:25 +0000)]
typo in comment

git-svn-id: svn://svn.berlios.de/openocd/trunk@2496 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agosome TODO notes on aduc702x which clearly needs more work & testing
oharboe [Wed, 8 Jul 2009 08:05:21 +0000 (08:05 +0000)]
some TODO notes on aduc702x which clearly needs more work & testing

git-svn-id: svn://svn.berlios.de/openocd/trunk@2495 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoi.MX27 reset problems fixed & update remaining reset problems notes
oharboe [Wed, 8 Jul 2009 06:49:15 +0000 (06:49 +0000)]
i.MX27 reset problems fixed & update remaining reset problems notes

git-svn-id: svn://svn.berlios.de/openocd/trunk@2494 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agosharpen reset_config for imx27 - use both trst & srst. srst pulls trst.
oharboe [Wed, 8 Jul 2009 06:32:27 +0000 (06:32 +0000)]
sharpen reset_config for imx27 - use both trst & srst. srst pulls trst.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2493 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agosrst pulls trst according to Freescale docs for i.mx27
oharboe [Tue, 7 Jul 2009 16:50:28 +0000 (16:50 +0000)]
srst pulls trst according to Freescale docs for i.mx27

git-svn-id: svn://svn.berlios.de/openocd/trunk@2492 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoZach Welch: move bugs into the right section
oharboe [Tue, 7 Jul 2009 11:39:04 +0000 (11:39 +0000)]
Zach Welch: move bugs into the right section

git-svn-id: svn://svn.berlios.de/openocd/trunk@2491 b42882b7-edfa-0310-969c-e2dbd0fdcd60

15 years agoUse reference to mailing list for known arm926ejs bugs rather fill The List with...
oharboe [Tue, 7 Jul 2009 11:32:58 +0000 (11:32 +0000)]
Use reference to mailing list for known arm926ejs bugs rather fill The List with lots of details

git-svn-id: svn://svn.berlios.de/openocd/trunk@2490 b42882b7-edfa-0310-969c-e2dbd0fdcd60