[USETUP] Get rid of the interface directory because we support text-mode only

base/setup/usetup/CMakeLists.txt

@@ -8,9 +8,6 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
 
 list(APPEND SOURCE
-    interface/usetup.c
-    interface/devinst.c
-    interface/consup.c
     native/utils/keytrans.c
     native/utils/console.c
     native/fslist.c
@@ -19,6 +16,8 @@ list(APPEND SOURCE
     cabinet.c
     chkdsk.c
     cmdcons.c
+    consup.c
+    devinst.c
     drivesup.c
     filesup.c
     filequeue.c
@@ -32,6 +31,7 @@ list(APPEND SOURCE
     progress.c
     registry.c
     settings.c
+    usetup.c
     usetup.h)
 
 add_executable(usetup ${SOURCE} usetup.rc)

base/setup/usetup/consup.c

@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/consup.c
+ * FILE:            base/setup/usetup/consup.c
  * PURPOSE:         Console support functions
  * PROGRAMMER:      Eric Kohl
  */

base/setup/usetup/consup.h

@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/consup.h
+ * FILE:            base/setup/usetup/consup.h
  * PURPOSE:         Console support functions
  * PROGRAMMER:      Eric Kohl
  */

base/setup/usetup/devinst.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/devinst.c
+ * FILE:            base/setup/usetup/devinst.c
  * PURPOSE:         Device installation
  * PROGRAMMER:      Hervé Poussineau (hpoussin@reactos.org)
  */

base/setup/usetup/usetup.c

@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/usetup.c
+ * FILE:            base/setup/usetup/usetup.c
  * PURPOSE:         Text-mode setup
  * PROGRAMMER:      Eric Kohl
  *                  Casper S. Hornstrup (chorns@users.sourceforge.net)

base/setup/usetup/usetup.h

@@ -59,7 +59,7 @@
 // #include <fslib/ntfslib.h>
 
 /* Internal Headers */
-#include "interface/consup.h"
+#include "consup.h"
 #include "inffile.h"
 #include "inicache.h"
 #include "progress.h"