Index: /branches/libffado-2.0/src/motu/motu_avdevice.h
===================================================================
--- /branches/libffado-2.0/src/motu/motu_avdevice.h (revision 1581)
+++ /branches/libffado-2.0/src/motu/motu_avdevice.h (revision 1703)
@@ -128,12 +128,13 @@
 
 enum EMotuModel {
-    MOTU_MODEL_NONE     = 0x0000,
-    MOTU_MODEL_828mkII  = 0x0001,
-    MOTU_MODEL_TRAVELER = 0x0002,
-    MOTU_MODEL_ULTRALITE= 0x0003,
-    MOTU_MODEL_8PRE     = 0x0004,
-    MOTU_MODEL_828MkI   = 0x0005,
-    MOTU_MODEL_896HD    = 0x0006,
-    MOTU_MODEL_828mk3   = 0x0007,
+    MOTU_MODEL_NONE         = 0x0000,
+    MOTU_MODEL_828mkII      = 0x0001,
+    MOTU_MODEL_TRAVELER     = 0x0002,
+    MOTU_MODEL_ULTRALITE    = 0x0003,
+    MOTU_MODEL_8PRE         = 0x0004,
+    MOTU_MODEL_828MkI       = 0x0005,
+    MOTU_MODEL_896HD        = 0x0006,
+    MOTU_MODEL_828mk3       = 0x0007,
+    MOTU_MODEL_ULTRALITEmk3 = 0x0008,
 };
 
Index: /branches/libffado-2.0/src/motu/motu_avdevice.cpp
===================================================================
--- /branches/libffado-2.0/src/motu/motu_avdevice.cpp (revision 1635)
+++ /branches/libffado-2.0/src/motu/motu_avdevice.cpp (revision 1703)
@@ -67,4 +67,5 @@
     {FW_VENDORID_MOTU, 0, 0x00000005, 0x000001f2, MOTU_MODEL_896HD, "MOTU", "896HD"},
     {FW_VENDORID_MOTU, 0, 0x00000015, 0x000001f2, MOTU_MODEL_828mk3, "MOTU", "828Mk3"},
+    {FW_VENDORID_MOTU, 0, 0x00000019, 0x000001f2, MOTU_MODEL_ULTRALITEmk3, "MOTU", "UltraLineMk3"},
 };
 
@@ -306,16 +307,43 @@
 };
 
+const PortEntry Ports_ULTRALITEmk3[] =
+{
+    {"Main-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 40},
+    {"Main-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 43},
+    {"Mix-L", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10},
+    {"Mix-R", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13},
+    {"Mic1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 16},
+    {"Mic2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 19},
+    {"Analog1", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 16},
+    {"Analog2", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 19},
+    {"Analog3", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 22},
+    {"Analog4", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 25},
+    {"Analog5", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 28},
+    {"Analog6", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 31},
+    {"Analog7", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 34},
+    {"Analog8", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 37},
+    {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10},
+    {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13},
+    {"SPDIF1", MOTU_PA_IN | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 40},
+    {"SPDIF2", MOTU_PA_IN | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 43},
+    {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 46},
+    {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 49},
+    {"SPDIF1", MOTU_PA_OUT | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 46},
+    {"SPDIF2", MOTU_PA_OUT | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 49},
+};
+
 /* The order of DevicesProperty entries must match the numeric order of the
  * MOTU model enumeration (EMotuModel).
  */
 const DevicePropertyEntry DevicesProperty[] = {
-//  { Ports_map,       N_ELEMENTS( Ports_map ),        MaxSR, MixerDescrPtr, Mark3MixerDescrPtr },
-    { Ports_828MKII,   N_ELEMENTS( Ports_828MKII ),    96000, &Mixer_828Mk2, NULL, },
-    { Ports_TRAVELER,  N_ELEMENTS( Ports_TRAVELER ),  192000, &Mixer_Traveler, NULL, },
-    { Ports_ULTRALITE, N_ELEMENTS( Ports_ULTRALITE ),  96000, &Mixer_Ultralite, NULL, },
-    { Ports_8PRE,      N_ELEMENTS( Ports_8PRE ),       96000, &Mixer_8pre, NULL, },
-    { Ports_828MKI,    N_ELEMENTS( Ports_828MKI ),     48000 },
-    { Ports_896HD,     N_ELEMENTS( Ports_896HD ),     192000, &Mixer_896HD, NULL, },
-    { Ports_828mk3,    N_ELEMENTS( Ports_828mk3 ),    192000 },
+//  { Ports_map,          N_ELEMENTS( Ports_map ),        MaxSR, MixerDescrPtr, Mark3MixerDescrPtr },
+    { Ports_828MKII,      N_ELEMENTS( Ports_828MKII ),       96000, &Mixer_828Mk2, NULL, },
+    { Ports_TRAVELER,     N_ELEMENTS( Ports_TRAVELER ),     192000, &Mixer_Traveler, NULL, },
+    { Ports_ULTRALITE,    N_ELEMENTS( Ports_ULTRALITE ),     96000, &Mixer_Ultralite, NULL, },
+    { Ports_8PRE,         N_ELEMENTS( Ports_8PRE ),          96000, &Mixer_8pre, NULL, },
+    { Ports_828MKI,       N_ELEMENTS( Ports_828MKI ),        48000 },
+    { Ports_896HD,        N_ELEMENTS( Ports_896HD ),        192000, &Mixer_896HD, NULL, },
+    { Ports_828mk3,       N_ELEMENTS( Ports_828mk3 ),       192000 },
+    { Ports_ULTRALITEmk3, N_ELEMENTS( Ports_ULTRALITEmk3 ), 192000 },
 };