From b99fea78a6b0db9dcf7133c302991b8a7a8f8538 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 29 Jan 2016 12:14:21 +0000 Subject: ext: Update NoMali to external rev f08e0a5 Update NoMali from external revision 9adf9d6 to f08e0a5 and bring in the following changes: f08e0a5 Add support for tracking address space state f11099e Fix job slot register handling when running new jobs b28c98e api: Add a reset callback 29ac4c3 tests: Update gitignore to cover all future test cases 1c6b893 Propagate reset calls to all job slots 8f8ec15 Remove redundant reg vector in MMU 85d90d2 tests: Fix incorrect extern declaration --- ext/nomali/include/libnomali/nomali.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/nomali/include/libnomali/nomali.h') diff --git a/ext/nomali/include/libnomali/nomali.h b/ext/nomali/include/libnomali/nomali.h index 9af2a417a..05b4099b6 100644 --- a/ext/nomali/include/libnomali/nomali.h +++ b/ext/nomali/include/libnomali/nomali.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 ARM Limited + * Copyright (c) 2014-2016 ARM Limited * All rights reserved * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -85,6 +85,8 @@ enum { NOMALI_CALLBACK_MEMREAD, /** Model write physical memory callback */ NOMALI_CALLBACK_MEMWRITE, + /** Model reset callback */ + NOMALI_CALLBACK_RESET, /** Number of defined callbacks */ NOMALI_CALLBACK_NUM_CALLBACKS @@ -125,6 +127,7 @@ typedef struct { nomali_addr_t addr, uint32_t value); uint32_t (*memread)(nomali_handle_t h, void *usr, nomali_addr_t addr); + void (*reset)(nomali_handle_t h, void *usr); } func; } nomali_callback_t; -- cgit v1.2.3