From 11b308e7363e937966b035b4891db32b4eece3bf Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Fri, 1 Oct 2010 08:55:28 -0800 Subject: integrating recent changes from fermi-test into fermi (i'll use "fermi" for more disruptive changes to the pipeline model such as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805] --- src/gpgpu-sim/icnt_wrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpgpu-sim/icnt_wrapper.h') diff --git a/src/gpgpu-sim/icnt_wrapper.h b/src/gpgpu-sim/icnt_wrapper.h index 0961fc4..26e394b 100644 --- a/src/gpgpu-sim/icnt_wrapper.h +++ b/src/gpgpu-sim/icnt_wrapper.h @@ -68,7 +68,7 @@ #define ICNT_WRAPPER_H // functional interface to the interconnect -typedef int (*icnt_has_buffer_p)(unsigned int input, unsigned int *size); +typedef int (*icnt_has_buffer_p)(unsigned int input, unsigned int size); typedef void (*icnt_push_p)(unsigned int input, unsigned int output, void* data, unsigned int size); typedef void* (*icnt_pop_p)(unsigned int output); typedef void (*icnt_transfer_p)( ); @@ -88,7 +88,7 @@ enum network_mode { N_NETWORK_MODE }; -void icnt_init( unsigned int n_shader, unsigned int n_mem ); +void icnt_init( unsigned int n_shader, unsigned int n_mem, struct shader_core_config *shader_config ); void icnt_reg_options( class OptionParser * opp ); #endif -- cgit v1.3