From 522946453b87d10e42bad9eb1bf4dc39c80541dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=83=D1=80=20=D0=A8=D0=B5=D0=B2=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= <nikto_b@noreply.localhost>
Date: Thu, 9 Apr 2026 13:24:44 +0300
Subject: [PATCH] Initial commit

---
 inc/mem_seg.h | 3 +++
 src/device.c  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/inc/mem_seg.h b/inc/mem_seg.h
index ffc8b47..9e1b760 100644
--- a/inc/mem_seg.h
+++ b/inc/mem_seg.h
@@ -1,9 +1,12 @@
 #ifndef __MEM_SEG_H__
 #define __MEM_SEG_H__
 
+<<<<<<< HEAD
 #ifndef DEVICE_TYPE
 #define DEVICE_TYPE EXTENDED_DEVICE_TYPE_DUMMY
 #endif
+=======
+>>>>>>> 1f4cc4d (Initial commit)
 
 // #define MEMSEG_PC_SEG_NUM 0
 // #define MEMSEG_PC_ADDR 0
diff --git a/src/device.c b/src/device.c
index ba834ab..4343847 100644
--- a/src/device.c
+++ b/src/device.c
@@ -730,7 +730,11 @@ device_public_context_t* init(device_specs_t* specs, char* errbuf)
 
 uint8_t pubDeviceType() 
 {
+<<<<<<< HEAD
     return DEVICE_TYPE;
+=======
+    return EXTENDED_DEVICE_TYPE_DUMMY;
+>>>>>>> 1f4cc4d (Initial commit)
 }