X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Flink-mso19%2Flink-mso19.h;h=79078f5db6c198a6bbac33be6011a79a0d7b4bbb;hb=847c21bc65343fa1197aa8455012d06a887e6626;hp=e7abee0302d68241a15b2d72a35852d7a8a04dee;hpb=8a839354c122b533181fe02da82d0110a44911cf;p=libsigrok.git

diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
index e7abee03..79078f5d 100644
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LINK_MSO19_H
-#define LINK_MSO19_H
+#ifndef SIGROK_LINK_MSO19_H
+#define SIGROK_LINK_MSO19_H
 
 /* our private per-instance data */
 struct mso {
@@ -83,23 +83,23 @@ struct rate_map {
 };
 
 static struct rate_map rate_map[] = {
-	{ MHZ(200),	0x0205, 0	},
-	{ MHZ(100),	0x0105, 0	},
-	{ MHZ(50),	0x0005, 0	},
-	{ MHZ(20),	0x0303, 0	},
-	{ MHZ(10),	0x0308, 0	},
-	{ MHZ(5),	0x030c, 0	},
-	{ MHZ(2),	0x0330, 0	},
-	{ MHZ(1),	0x0362, 0	},
-	{ KHZ(500),	0x03c6, 0	},
-	{ KHZ(200),	0x07f2, 0	},
-	{ KHZ(100),	0x0fe6, 0	},
-	{ KHZ(50),	0x1fce, 0	},
-	{ KHZ(20),	0x4f86, 0	},
-	{ KHZ(10),	0x9f0e, 0	},
-	{ KHZ(5),	0x03c7, 0x20	},
-	{ KHZ(2),	0x07f3, 0x20	},
-	{ KHZ(1),	0x0fe7, 0x20	},
+	{ SR_MHZ(200),	0x0205, 0	},
+	{ SR_MHZ(100),	0x0105, 0	},
+	{ SR_MHZ(50),	0x0005, 0	},
+	{ SR_MHZ(20),	0x0303, 0	},
+	{ SR_MHZ(10),	0x0308, 0	},
+	{ SR_MHZ(5),	0x030c, 0	},
+	{ SR_MHZ(2),	0x0330, 0	},
+	{ SR_MHZ(1),	0x0362, 0	},
+	{ SR_KHZ(500),	0x03c6, 0	},
+	{ SR_KHZ(200),	0x07f2, 0	},
+	{ SR_KHZ(100),	0x0fe6, 0	},
+	{ SR_KHZ(50),	0x1fce, 0	},
+	{ SR_KHZ(20),	0x4f86, 0	},
+	{ SR_KHZ(10),	0x9f0e, 0	},
+	{ SR_KHZ(5),	0x03c7, 0x20	},
+	{ SR_KHZ(2),	0x07f3, 0x20	},
+	{ SR_KHZ(1),	0x0fe7, 0x20	},
 	{ 500,		0x1fcf, 0x20	},
 	{ 200,		0x4f87, 0x20	},
 	{ 100,		0x9f0f, 0x20	},