Pavel Chromy style fixes.

[openocd.git] / src / flash / stellaris.c

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 970c1d69eea45698468e69f7a249971fcb836f27..d8bd14e05f2474f8df4353cdf7abe34c983b16a7 100644 (file)
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -49,6 +49,7 @@ int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
 int stellaris_erase(struct flash_bank_s *bank, int first, int last);
 int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last);
 int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+int stellaris_auto_probe(struct flash_bank_s *bank);
 int stellaris_probe(struct flash_bank_s *bank);
 int stellaris_erase_check(struct flash_bank_s *bank);
 int stellaris_protect_check(struct flash_bank_s *bank);
@@ -70,6 +71,7 @@ flash_driver_t stellaris_flash =
        .protect = stellaris_protect,
        .write = stellaris_write,
        .probe = stellaris_probe,
+       .auto_probe = stellaris_auto_probe,
        .erase_check = stellaris_erase_check,
        .protect_check = stellaris_protect_check,
        .info = stellaris_info
@@ -83,50 +85,122 @@ struct {
 {
        {0x01,"LM3S101"},
        {0x02,"LM3S102"},
+       {0x19,"LM3S300"},
        {0x11,"LM3S301"},
        {0x12,"LM3S310"},
+       {0x1A,"LM3S308"},
        {0x13,"LM3S315"},
        {0x14,"LM3S316"},
+       {0x17,"LM3S317"},
+       {0x18,"LM3S318"},
        {0x15,"LM3S328"},
+       {0x2A,"LM3S600"},
        {0x21,"LM3S601"},
+       {0x2B,"LM3S608"},
        {0x22,"LM3S610"},
        {0x23,"LM3S611"},
        {0x24,"LM3S612"},
        {0x25,"LM3S613"},
        {0x26,"LM3S615"},
+       {0x28,"LM3S617"},
+       {0x29,"LM3S618"},
        {0x27,"LM3S628"},
+       {0x38,"LM3S800"},
        {0x31,"LM3S801"},
+       {0x39,"LM3S808"},
        {0x32,"LM3S811"},
        {0x33,"LM3S812"},
        {0x34,"LM3S815"},
+       {0x36,"LM3S817"},
+       {0x37,"LM3S818"},
        {0x35,"LM3S828"},
-    {0x51,"LM3S2110"},
-    {0x84,"LM3S2139"},
-    {0xa2,"LM3S2410"},
-    {0x59,"LM3S2412"},
-    {0x56,"LM3S2432"},
-    {0x5a,"LM3S2533"},
-    {0x57,"LM3S2620"},
-    {0x85,"LM3S2637"},
-    {0x53,"LM3S2651"},
-    {0xa4,"LM3S2730"},
-    {0x52,"LM3S2739"},
-    {0x54,"LM3S2939"},
-    {0x8f,"LM3S2948"},
-    {0x58,"LM3S2950"},
-    {0x55,"LM3S2965"},
-    {0xa1,"LM3S6100"},
-    {0x74,"LM3S6110"},
-    {0xa5,"LM3S6420"},
-    {0x82,"LM3S6422"},
-    {0x75,"LM3S6432"},
-    {0x71,"LM3S6610"},
-    {0x83,"LM3S6633"},
-    {0x8b,"LM3S6637"},
-    {0xa3,"LM3S6730"},
-    {0x89,"LM3S6938"},
-    {0x78,"LM3S6952"},
-    {0x73,"LM3S6965"},
+       {0x51,"LM3S2110"},
+       {0x52,"LM3S2739"},
+       {0x53,"LM3S2651"},
+       {0x54,"LM3S2939"},
+       {0x55,"LM3S2965"},
+       {0x56,"LM3S2432"},
+       {0x57,"LM3S2620"},
+       {0x58,"LM3S2950"},
+       {0x59,"LM3S2412"},
+       {0x5A,"LM3S2533"},
+       {0x61,"LM3S8630"},
+       {0x62,"LM3S8970"},
+       {0x63,"LM3S8730"},
+       {0x64,"LM3S8530"},
+       {0x65,"LM3S8930"},
+       {0x71,"LM3S6610"},
+       {0x72,"LM3S6950"},
+       {0x73,"LM3S6965"},
+       {0x74,"LM3S6110"},
+       {0x75,"LM3S6432"},
+       {0x76,"LM3S6537"},
+       {0x77,"LM3S6753"},
+       {0x78,"LM3S6952"},
+       {0x82,"LM3S6422"},
+       {0x83,"LM3S6633"},
+       {0x84,"LM3S2139"},
+       {0x85,"LM3S2637"},
+       {0x86,"LM3S8738"},
+       {0x88,"LM3S8938"},
+       {0x89,"LM3S6938"},
+       {0x8B,"LM3S6637"},
+       {0x8C,"LM3S8933"},
+       {0x8D,"LM3S8733"},
+       {0x8E,"LM3S8538"},
+       {0x8F,"LM3S2948"},
+       {0xA1,"LM3S6100"},
+       {0xA2,"LM3S2410"},
+       {0xA3,"LM3S6730"},
+       {0xA4,"LM3S2730"},
+       {0xA5,"LM3S6420"},
+       {0xA6,"LM3S8962"},
+       {0xB3,"LM3S1635"},
+       {0xB4,"LM3S1850"},
+       {0xB5,"LM3S1960"},
+       {0xB7,"LM3S1937"},
+       {0xB8,"LM3S1968"},
+       {0xB9,"LM3S1751"},
+       {0xBA,"LM3S1439"},
+       {0xBB,"LM3S1512"},
+       {0xBC,"LM3S1435"},
+       {0xBD,"LM3S1637"},
+       {0xBE,"LM3S1958"},
+       {0xBF,"LM3S1110"},
+       {0xC0,"LM3S1620"},
+       {0xC1,"LM3S1150"},
+       {0xC2,"LM3S1165"},
+       {0xC3,"LM3S1133"},
+       {0xC4,"LM3S1162"},
+       {0xC5,"LM3S1138"},
+       {0xC6,"LM3S1332"},
+       {0xC7,"LM3S1538"},
+       {0xD0,"LM3S6815"},
+       {0xD1,"LM3S6816"},
+       {0xD2,"LM3S6915"},
+       {0xD3,"LM3S6916"},
+       {0xD4,"LM3S2016"},
+       {0xD5,"LM3S1615"},
+       {0xD6,"LM3S1616"},
+       {0xD7,"LM3S8971"},
+       {0xD8,"LM3S1108"},
+       {0xD9,"LM3S1101"},
+       {0xDA,"LM3S1608"},
+       {0xDB,"LM3S1601"},
+       {0xDC,"LM3S1918"},
+       {0xDD,"LM3S1911"},
+       {0xDE,"LM3S2108"},
+       {0xDF,"LM3S2101"},
+       {0xE0,"LM3S2608"},
+       {0xE1,"LM3S2601"},
+       {0xE2,"LM3S2918"},
+       {0xE3,"LM3S2911"},
+       {0xE4,"LM3S6118"},
+       {0xE5,"LM3S6111"},
+       {0xE6,"LM3S6618"},
+       {0xE7,"LM3S6611"},
+       {0xE8,"LM3S6918"},
+       {0xE9,"LM3S6911"},
        {0,"Unknown part"}
 };
 
@@ -440,11 +514,6 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        target_t *target = bank->target;
        
-       if (bank->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
        if (stellaris_info->did1 == 0)
        {
                stellaris_read_part_info(bank);
@@ -743,11 +812,6 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
        DEBUG("(bank=%08X buffer=%08X offset=%08X count=%08X)",
                        (unsigned int)bank, (unsigned int)buffer, offset, count);
 
-       if (bank->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
        if (stellaris_info->did1 == 0)
        {
                stellaris_read_part_info(bank);
@@ -844,6 +908,8 @@ int stellaris_probe(struct flash_bank_s *bank)
         */
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        
+       stellaris_info->probed = 0;
+       
        if (stellaris_info->did1 == 0)
        {
                stellaris_read_part_info(bank);
@@ -855,5 +921,15 @@ int stellaris_probe(struct flash_bank_s *bank)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
+       stellaris_info->probed = 1;
+       
        return ERROR_OK;
 }
+
+int stellaris_auto_probe(struct flash_bank_s *bank)
+{
+       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+       if (stellaris_info->probed)
+               return ERROR_OK;
+       return stellaris_probe(bank);
+}