Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b5774f authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai
Browse files

ALSA: asihpi - Give more meaningful name to hpi request message type 



Having a 'request message' makes more sense than a 'message message'

Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6a6d822e

sound/pci/asihpi/hpi6000.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr) 
			HPI_ERROR_PROCESSING_MESSAGE);

			HPI_ERROR_PROCESSING_MESSAGE);





	switch (phm->type) {

	switch (phm->type) {

	case HPI_TYPE_MESSAGE:

	case HPI_TYPE_REQUEST:

		switch (phm->object) {

		switch (phm->object) {

		case HPI_OBJ_SUBSYSTEM:

		case HPI_OBJ_SUBSYSTEM:

			subsys_message(phm, phr);

			subsys_message(phm, phr);
@@ -538,7 +538,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao, 




		HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n");

		HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n");

		memset(&hm, 0, sizeof(hm));

		memset(&hm, 0, sizeof(hm));

		hm.type = HPI_TYPE_MESSAGE;

		hm.type = HPI_TYPE_REQUEST;

		hm.size = sizeof(struct hpi_message);

		hm.size = sizeof(struct hpi_message);

		hm.object = HPI_OBJ_ADAPTER;

		hm.object = HPI_OBJ_ADAPTER;

		hm.function = HPI_ADAPTER_GET_INFO;

		hm.function = HPI_ADAPTER_GET_INFO;

sound/pci/asihpi/hpi6205.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -392,7 +392,7 @@ void _HPI_6205(struct hpi_adapter_obj *pao, struct hpi_message *phm, 




	HPI_DEBUG_LOG(VERBOSE, "start of switch\n");

	HPI_DEBUG_LOG(VERBOSE, "start of switch\n");

	switch (phm->type) {

	switch (phm->type) {

	case HPI_TYPE_MESSAGE:

	case HPI_TYPE_REQUEST:

		switch (phm->object) {

		switch (phm->object) {

		case HPI_OBJ_SUBSYSTEM:

		case HPI_OBJ_SUBSYSTEM:

			subsys_message(pao, phm, phr);

			subsys_message(pao, phm, phr);
@@ -634,11 +634,12 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, 




		HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n");

		HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n");

		memset(&hm, 0, sizeof(hm));

		memset(&hm, 0, sizeof(hm));

		hm.type = HPI_TYPE_MESSAGE;

		/* wAdapterIndex == version == 0 */

		hm.type = HPI_TYPE_REQUEST;

		hm.size = sizeof(hm);

		hm.size = sizeof(hm);

		hm.object = HPI_OBJ_ADAPTER;

		hm.object = HPI_OBJ_ADAPTER;

		hm.function = HPI_ADAPTER_GET_INFO;

		hm.function = HPI_ADAPTER_GET_INFO;

		hm.adapter_index = 0;



		memset(&hr, 0, sizeof(hr));

		memset(&hr, 0, sizeof(hr));

		hr.size = sizeof(hr);

		hr.size = sizeof(hr);

sound/pci/asihpi/hpi_internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -364,7 +364,7 @@ Used in DLL to indicate device not present 
#define HPI_ADAPTER_ASI(f)   (f)

#define HPI_ADAPTER_ASI(f)   (f)





enum HPI_MESSAGE_TYPES {

enum HPI_MESSAGE_TYPES {

	HPI_TYPE_MESSAGE = 1,

	HPI_TYPE_REQUEST = 1,

	HPI_TYPE_RESPONSE = 2,

	HPI_TYPE_RESPONSE = 2,

	HPI_TYPE_DATA = 3,

	HPI_TYPE_DATA = 3,

	HPI_TYPE_SSX2BYPASS_MESSAGE = 4

	HPI_TYPE_SSX2BYPASS_MESSAGE = 4

sound/pci/asihpi/hpicmn.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -682,7 +682,7 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr) 
void HPI_COMMON(struct hpi_message *phm, struct hpi_response *phr)

void HPI_COMMON(struct hpi_message *phm, struct hpi_response *phr)

{

{

	switch (phm->type) {

	switch (phm->type) {

	case HPI_TYPE_MESSAGE:

	case HPI_TYPE_REQUEST:

		switch (phm->object) {

		switch (phm->object) {

		case HPI_OBJ_SUBSYSTEM:

		case HPI_OBJ_SUBSYSTEM:

			subsys_message(phm, phr);

			subsys_message(phm, phr);

sound/pci/asihpi/hpimsginit.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ static void hpi_init_message(struct hpi_message *phm, u16 object, 
	if (gwSSX2_bypass)

	if (gwSSX2_bypass)

		phm->type = HPI_TYPE_SSX2BYPASS_MESSAGE;

		phm->type = HPI_TYPE_SSX2BYPASS_MESSAGE;

	else

	else

		phm->type = HPI_TYPE_MESSAGE;

		phm->type = HPI_TYPE_REQUEST;

	phm->object = object;

	phm->object = object;

	phm->function = function;

	phm->function = function;

	phm->version = 0;

	phm->version = 0;
@@ -89,7 +89,7 @@ static void hpi_init_messageV1(struct hpi_message_header *phm, u16 size, 
	memset(phm, 0, sizeof(*phm));

	memset(phm, 0, sizeof(*phm));

	if ((object > 0) && (object <= HPI_OBJ_MAXINDEX)) {

	if ((object > 0) && (object <= HPI_OBJ_MAXINDEX)) {

		phm->size = size;

		phm->size = size;

		phm->type = HPI_TYPE_MESSAGE;

		phm->type = HPI_TYPE_REQUEST;

		phm->object = object;

		phm->object = object;

		phm->function = function;

		phm->function = function;

		phm->version = 1;

		phm->version = 1;