Commit 5e02e8e6 authored by Cedric Roux's avatar Cedric Roux

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop

parents 3f20ce7b 3f2a080c
...@@ -95,6 +95,10 @@ ID = ENB_MAC_UE_UL_CE ...@@ -95,6 +95,10 @@ ID = ENB_MAC_UE_UL_CE
DESC = MAC uplink UE received control element DESC = MAC uplink UE received control element
GROUP = ALL:MAC:ENB GROUP = ALL:MAC:ENB
FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,ce FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,ce
ID = ENB_MAC_UE_DL_PDU_WITH_DATA
DESC = MAC downlink PDU for an UE
GROUP = ALL:MAC:ENB
FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : buffer,data
#RLC logs #RLC logs
ID = ENB_RLC_DL ID = ENB_RLC_DL
......
...@@ -34,11 +34,14 @@ static void scroll(void *private, gui *g, ...@@ -34,11 +34,14 @@ static void scroll(void *private, gui *g,
int number_of_lines; int number_of_lines;
int new_line; int new_line;
int inc; int inc;
int *d = notification_data;
int key_modifiers = *d;
textlist_state(g, w, &visible_lines, &start_line, &number_of_lines); textlist_state(g, w, &visible_lines, &start_line, &number_of_lines);
inc = 10; inc = 10;
if (inc > visible_lines - 2) inc = visible_lines - 2; if (inc > visible_lines - 2) inc = visible_lines - 2;
if (inc < 1) inc = 1; if (inc < 1) inc = 1;
if (key_modifiers & KEY_CONTROL) inc = 1;
if (!strcmp(notification, "scrollup")) inc = -inc; if (!strcmp(notification, "scrollup")) inc = -inc;
new_line = start_line + inc; new_line = start_line + inc;
......
...@@ -83,8 +83,8 @@ int new_color(gui *gui, char *color); ...@@ -83,8 +83,8 @@ int new_color(gui *gui, char *color);
/* notifications */ /* notifications */
/* known notifications: /* known notifications:
* - textlist: * - textlist:
* - scrollup { void *: NULL } * - scrollup { int: key_modifiers }
* - scrolldown { void *: NULL } * - scrolldown { int: key_modifiers }
* - click { int [2]: line, button } * - click { int [2]: line, button }
* - label: * - label:
* - click { int: button } (if enabled) * - click { int: button } (if enabled)
......
...@@ -54,11 +54,11 @@ static void button(gui *_g, widget *_this, int x, int y, ...@@ -54,11 +54,11 @@ static void button(gui *_g, widget *_this, int x, int y,
x -= this->common.x; x -= this->common.x;
/* scroll up */ /* scroll up */
if (button == 4 && up == 0) { if (button == 4 && up == 0) {
gui_notify(g, "scrollup", _this, NULL); gui_notify(g, "scrollup", _this, &key_modifiers);
} }
/* scroll down */ /* scroll down */
if (button == 5 && up == 0) { if (button == 5 && up == 0) {
gui_notify(g, "scrolldown", _this, NULL); gui_notify(g, "scrolldown", _this, &key_modifiers);
} }
/* button 1/2/3 click */ /* button 1/2/3 click */
if (button >= 1 && button <= 3 && up == 0) { if (button >= 1 && button <= 3 && up == 0) {
......
...@@ -89,6 +89,8 @@ static void scroll(void *private, gui *g, ...@@ -89,6 +89,8 @@ static void scroll(void *private, gui *g,
int number_of_lines; int number_of_lines;
int new_line; int new_line;
int inc; int inc;
int *d = notification_data;
int key_modifiers = *d;
if (pthread_mutex_lock(&this->lock)) abort(); if (pthread_mutex_lock(&this->lock)) abort();
...@@ -96,6 +98,7 @@ static void scroll(void *private, gui *g, ...@@ -96,6 +98,7 @@ static void scroll(void *private, gui *g,
inc = 10; inc = 10;
if (inc > visible_lines - 2) inc = visible_lines - 2; if (inc > visible_lines - 2) inc = visible_lines - 2;
if (inc < 1) inc = 1; if (inc < 1) inc = 1;
if (key_modifiers & KEY_CONTROL) inc = 1;
if (!strcmp(notification, "scrollup")) inc = -inc; if (!strcmp(notification, "scrollup")) inc = -inc;
new_line = start_line + inc; new_line = start_line + inc;
...@@ -122,7 +125,19 @@ static void click(void *private, gui *g, ...@@ -122,7 +125,19 @@ static void click(void *private, gui *g,
if (pthread_mutex_lock(&this->lock)) abort(); if (pthread_mutex_lock(&this->lock)) abort();
if (button == 1) this->autoscroll = 1 - this->autoscroll; if (button == 1) this->autoscroll = 1;
if (button == 3) this->autoscroll = 0;
if (this->autoscroll) {
int visible_lines, start_line, number_of_lines;
textlist_state(this->g, this->w, &visible_lines, &start_line,
&number_of_lines);
start_line = number_of_lines - visible_lines;
if (start_line < 0) start_line = 0;
textlist_set_start_line(this->g, this->w, start_line);
/* this call is not necessary, but if things change in textlist... */
widget_dirty(this->g, this->w);
}
if (pthread_mutex_unlock(&this->lock)) abort(); if (pthread_mutex_unlock(&this->lock)) abort();
} }
......
...@@ -1110,6 +1110,9 @@ schedule_ue_spec( ...@@ -1110,6 +1110,9 @@ schedule_ue_spec(
module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), TBS); module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), TBS);
} }
T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP), T_INT(subframeP),
T_INT(harq_pid), T_BUFFER(UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], TBS));
aggregation = process_ue_cqi(module_idP,UE_id); aggregation = process_ue_cqi(module_idP,UE_id);
UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb; UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment