Changes for the USB debugger "Event Data TRB" dialog.

Windows version: Added missing resources. GTK version: Added missing widgets.
bochs-emu · Jan 24, 2025 · cb6be03 · cb6be03
1 parent f856914
commit cb6be03
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/bochs/gui/gtk_usb_debug.cc b/bochs/gui/gtk_usb_debug.cc
@@ -1244,6 +1244,11 @@ void xhci_view_trb_dialog(Bit8u type, struct TRB *trb)
       sprintf(str, "0x" FMT_ADDRX64, (Bit64u)(trb->parameter & ~BX_CONST64(0x0F)));
       gtk_entry_set_text(GTK_ENTRY(entry[e_num++]), str);
       break;
+    case EVENT_DATA:
+      entry[e_num] = usbdlg_create_entry_with_label(grid, "Event Data", 0, row++);
+      sprintf(str, "0x" FMT_ADDRX64, trb->parameter);
+      gtk_entry_set_text(GTK_ENTRY(entry[e_num++]), str);
+      break;
     case ENABLE_SLOT:
       entry[e_num] = usbdlg_create_entry_with_label(grid, "Slot Type", 0, row++);
       sprintf(str, "%i", TRB_GET_STYPE(trb->command));
@@ -1399,6 +1404,7 @@ void xhci_view_trb_dialog(Bit8u type, struct TRB *trb)
     case DATA_STAGE:
     case STATUS_STAGE:
     case LINK:
+    case EVENT_DATA:
     case NO_OP:
       entry[e_num] = usbdlg_create_entry_with_label(grid, "Interrupter Target", 0, row++);
       sprintf(str, "%i", TRB_GET_TARGET(trb->status));
@@ -1449,7 +1455,7 @@ void xhci_view_trb_dialog(Bit8u type, struct TRB *trb)
   trb_type = usbdlg_create_ro_entry_with_label(grid, "TRB Type", 0, row++);
   sprintf(str, "%i", TRB_GET_TYPE(trb->command));
   gtk_entry_set_text(GTK_ENTRY(trb_type), str);
-  if (type == NORMAL) {
+  if ((type == NORMAL) || (type == EVENT_DATA)) {
     checkbox[c_num] = gtk_check_button_new_with_label("Block Event Interrupt");
     if (TRB_DC(trb->command)) {
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox[c_num]), TRUE);
@@ -1473,6 +1479,7 @@ void xhci_view_trb_dialog(Bit8u type, struct TRB *trb)
     case DATA_STAGE:
     case STATUS_STAGE:
     case LINK:
+    case EVENT_DATA:
     case NO_OP:
       checkbox[c_num] = gtk_check_button_new_with_label("Interrupt On Complete");
       if (TRB_IOC(trb->command)) {

diff --git a/bochs/win32usbres.rc b/bochs/win32usbres.rc
@@ -539,6 +539,36 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,146,152,50,14
 END
 
+USB_DEBUG_XHCI_DLG_EVENT_TRB DIALOG DISCARDABLE  0, 0, 203, 174
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Link TRB"
+FONT 8, "Helv"
+BEGIN
+    RTEXT           "Event Data:",IDC_STATIC,11,9,85,8
+    EDITTEXT        IDC_TRB_DATA_PTR,100,8,96,12,ES_RIGHT | ES_AUTOHSCROLL
+    RTEXT           "Interrupter Target:",IDC_STATIC,11,23,85,8
+    EDITTEXT        IDC_TRB_INT_TARGET,100,22,48,12,ES_RIGHT | 
+                    ES_AUTOHSCROLL
+    RTEXT           "TRB Type:",IDC_STATIC,11,64,85,8
+    EDITTEXT        IDC_TRB_TYPE,100,64,48,12,ES_RIGHT | ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_TABSTOP
+    CONTROL         "Block Event Interrupt:",IDC_TRB_BEI,"Button",
+                    BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_RIGHT | WS_TABSTOP,7,
+                    77,101,12
+    CONTROL         "Interrupt on Complete:",IDC_TRB_IOC,"Button",
+                    BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_RIGHT | WS_TABSTOP,7,
+                    99,101,12
+    CONTROL         "Chain Bit:",IDC_TRB_CH,"Button",BS_AUTOCHECKBOX | 
+                    BS_LEFTTEXT | BS_RIGHT | WS_TABSTOP,7,110,101,12
+    CONTROL         "Evaluate Next TRB:",IDC_TRB_ENT,"Button",
+                    BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_RIGHT | WS_TABSTOP,7,
+                    143,101,12
+    CONTROL         "Cycle Bit:",IDC_TRB_C,"Button",BS_AUTOCHECKBOX | 
+                    BS_LEFTTEXT | BS_RIGHT | WS_TABSTOP,7,154,101,12
+    DEFPUSHBUTTON   "OK",IDOK,146,135,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,146,152,50,14
+END
+
 USB_DEBUG_XHCI_DLG_NOOP_TRB DIALOG DISCARDABLE  0, 0, 203, 174
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "No-Op TRB"