Merge branch 'zephyrproject-rtos:main' into IssueId_64625_rpa_diff_fo…

…r_adv_sets_with_same_id

boards/posix/native_posix/irq_handler.c

@@ -228,6 +228,11 @@ int posix_get_current_irq(void)
 void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(const void *),
 		       const void *isr_param_p)
 {
+	if (irq_p >= N_IRQS) {
+		posix_print_error_and_exit("Attempted to configure not existent interrupt %u\n",
+					   irq_p);
+		return;
+	}
 	irq_vector_table[irq_p].irq   = irq_p;
 	irq_vector_table[irq_p].func  = isr_p;
 	irq_vector_table[irq_p].param = isr_param_p;

doc/releases/release-notes-3.6.rst

@@ -236,8 +236,6 @@ Drivers and Sensors
 
 * DMA
 
-* EEPROM
-
 * Entropy
 
   * The "native_posix" entropy driver now accepts a new command line option ``seed-random``.

doc/services/input/gpio-kbd.rst

@@ -199,6 +199,38 @@ The actual key mask can be changed at runtime by enabling
 :kconfig:option:`CONFIG_INPUT_KBD_ACTUAL_KEY_MASK_DYNAMIC` and the using the
 :c:func:`input_kbd_matrix_actual_key_mask_set` API.
 
+Keymap configuration
+********************
+
+Keyboard matrix devices report a series of x/y/touch events. These can be
+mapped to normal key events using the :dtcompatible:`input-keymap` driver.
+
+For example, the following would setup a ``keymap`` device that take the
+x/y/touch events as an input and generate corresponding key events as an
+output:
+
+.. code-block:: devicetree
+
+  kbd {
+      ...
+      keymap {
+          compatible = "input-keymap";
+          keymap = <
+              MATRIX_KEY(0, 0, INPUT_KEY_1)
+              MATRIX_KEY(0, 1, INPUT_KEY_2)
+              MATRIX_KEY(0, 2, INPUT_KEY_3)
+              MATRIX_KEY(1, 0, INPUT_KEY_4)
+              MATRIX_KEY(1, 1, INPUT_KEY_5)
+              MATRIX_KEY(1, 2, INPUT_KEY_6)
+              MATRIX_KEY(2, 0, INPUT_KEY_7)
+              MATRIX_KEY(2, 1, INPUT_KEY_8)
+              MATRIX_KEY(2, 2, INPUT_KEY_9)
+          >;
+          row-size = <3>;
+          col-size = <3>;
+      };
+  };
+
 Keyboard matrix shell commands
 ******************************
 

doc/services/input/index.rst

@@ -55,6 +55,14 @@ footprint, or in a complex application with an existing event model, where the
 callback is just a wrapper to pipe back the event in a more complex application
 specific event system.
 
+HID code mapping
+****************
+
+A common use case for input devices is to use them to generate HID reports. For
+this purpose, the :c:func:`input_to_hid_code` and
+:c:func:`input_to_hid_modifier` functions can be used to map input codes to HID
+codes and modifiers.
+
 Kscan Compatibility
 *******************
 

doc/services/storage/nvs/nvs.rst

@@ -19,7 +19,11 @@ combination of these.
 Each element is stored in flash as metadata (8 byte) and data. The metadata is
 written in a table starting from the end of a nvs sector, the data is
 written one after the other from the start of the sector. The metadata consists
-of: id, data offset in sector, data length, part (unused) and a crc.
+of: id, data offset in sector, data length, part (unused), and a CRC. The CRC is
+only calculated over the metadata and only ensures that a write has been
+completed. The actual data of the element is not protected by a CRC. It is
+encouraged to include a CRC as part of the data and to take appropriate
+corrective actions when the data CRC does not match its expected value.
 
 A write of data to nvs always starts with writing the data, followed by a write
 of the metadata. Data that is written in flash without metadata is ignored

include/zephyr/posix/pthread.h

@@ -432,7 +432,7 @@ int pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
 #ifdef CONFIG_PTHREAD_IPC
 int pthread_once(pthread_once_t *once, void (*initFunc)(void));
 #endif
-void pthread_exit(void *retval);
+FUNC_NORETURN void pthread_exit(void *retval);
 int pthread_join(pthread_t thread, void **status);
 int pthread_cancel(pthread_t pthread);
 int pthread_detach(pthread_t thread);