From cbe796b97fc2adfe8c307bab72a1d2ea783074d8 Mon Sep 17 00:00:00 2001 From: Sergi Hernandez Juan <shernand@iri.upc.edu> Date: Tue, 8 Oct 2019 12:12:10 +0200 Subject: [PATCH] Added the device ID in all the EEPROM registers of the frame buffer. --- .../include/frame_buffer_control_registers.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pattern_frame_buffer/include/frame_buffer_control_registers.h b/pattern_frame_buffer/include/frame_buffer_control_registers.h index f44d32d..1abce56 100644 --- a/pattern_frame_buffer/include/frame_buffer_control_registers.h +++ b/pattern_frame_buffer/include/frame_buffer_control_registers.h @@ -48,15 +48,15 @@ #define DEFAULT_FRAME_BUFFER_CONTROL_NUM_BUFFERS 0x0001 #endif -#define frame_buffer_control_eeprom_data(name,section_name,base_address) \ -unsigned short int name##_eeprom_data[] __attribute__ ((section (section_name)))={DEFAULT_FRAME_BUFFER_CONTROL_PERIOD&0x00FF,base_address+FRAME_BUFFER_CONTROL_PERIOD_OFFSET, \ - (DEFAULT_FRAME_BUFFER_CONTROL_PERIOD>>8)&0x00FF,base_address+FRAME_BUFFER_CONTROL_PERIOD_OFFSET+1, \ - DEFAULT_FRAME_BUFFER_CONTROL_NUM_ROWS&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_ROWS_OFFSET, \ - (DEFAULT_FRAME_BUFFER_CONTROL_NUM_ROWS>>8)&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_ROWS_OFFSET+1, \ - DEFAULT_FRAME_BUFFER_CONTROL_NUM_PIXELS&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_PIXELS_OFFSET, \ - (DEFAULT_FRAME_BUFFER_CONTROL_NUM_PIXELS>>8)&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_PIXELS_OFFSET+1, \ - DEFAULT_FRAME_BUFFER_CONTROL_NUM_BUFFERS&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_BUFFERS_OFFSET, \ - (DEFAULT_FRAME_BUFFER_CONTROL_NUM_BUFFERS>>8)&0x00FF,base_address+FRAME_BUFFER_CONTROL_NUM_BUFFERS_OFFSET+1}; +#define frame_buffer_control_eeprom_data(name,section_name,base_address,device_id) \ +unsigned short int name##_eeprom_data[] __attribute__ ((section (section_name)))={DEFAULT_FRAME_BUFFER_CONTROL_PERIOD&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_PERIOD_OFFSET, \ + (DEFAULT_FRAME_BUFFER_CONTROL_PERIOD>>8)&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_PERIOD_OFFSET+1, \ + DEFAULT_FRAME_BUFFER_CONTROL_NUM_ROWS&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_ROWS_OFFSET, \ + (DEFAULT_FRAME_BUFFER_CONTROL_NUM_ROWS>>8)&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_ROWS_OFFSET+1, \ + DEFAULT_FRAME_BUFFER_CONTROL_NUM_PIXELS&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_PIXELS_OFFSET, \ + (DEFAULT_FRAME_BUFFER_CONTROL_NUM_PIXELS>>8)&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_PIXELS_OFFSET+1, \ + DEFAULT_FRAME_BUFFER_CONTROL_NUM_BUFFERS&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_BUFFERS_OFFSET, \ + (DEFAULT_FRAME_BUFFER_CONTROL_NUM_BUFFERS>>8)&0x00FF,(device_id<<8)+base_address+FRAME_BUFFER_CONTROL_NUM_BUFFERS_OFFSET+1}; #endif -- GitLab