SPI table updates (some new devices and new info)

[openocd.git] / src / jtag / aice / aice_pipe.c

diff --git a/src/jtag/aice/aice_pipe.c b/src/jtag/aice/aice_pipe.c
index 44eade2d536b84a4cf424fba6337946543ca0c74..bdc8c090a5a22b5489eab01f7c4d7ffa9fb79790 100644 (file)
--- a/src/jtag/aice/aice_pipe.c
+++ b/src/jtag/aice/aice_pipe.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,7 +45,7 @@ static int aice_pipe_write(const void *buffer, int count)
 
        success = WriteFile(aice_pipe_output[1], buffer, count, &written, NULL);
        if (!success) {
-               LOG_ERROR("(WIN32) write to pipe failed, error code: 0x%08lx", GetLastError());
+               LOG_ERROR("(WIN32) write to pipe failed, error code: 0x%08l" PRIx32, GetLastError());
                return -1;
        }
 
@@ -61,7 +59,7 @@ static int aice_pipe_read(void *buffer, int count)
 
        success = ReadFile(aice_pipe_input[0], buffer, count, &has_read, NULL);
        if (!success || (has_read == 0)) {
-               LOG_ERROR("(WIN32) read from pipe failed, error code: 0x%08lx", GetLastError());
+               LOG_ERROR("(WIN32) read from pipe failed, error code: 0x%08l" PRIx32, GetLastError());
                return -1;
        }
 
@@ -176,7 +174,7 @@ static int aice_pipe_write(const void *buffer, int count)
 static int aice_pipe_read(void *buffer, int count)
 {
        int n;
-       long long then, cur;
+       int64_t then, cur;
 
        then = timeval_ms();
 
@@ -788,8 +786,8 @@ static int aice_pipe_memory_mode(uint32_t coreid, enum nds_memory_select mem_sel
                return ERROR_FAIL;
 }
 
-static int aice_pipe_read_tlb(uint32_t coreid, uint32_t virtual_address,
-               uint32_t *physical_address)
+static int aice_pipe_read_tlb(uint32_t coreid, target_addr_t virtual_address,
+               target_addr_t *physical_address)
 {
        char line[AICE_PIPE_MAXLINE];
        char command[AICE_PIPE_MAXLINE];